summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2020-06-10 23:16:48 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2020-06-10 23:16:46 -0700
commit628e48876ef12321be95ac6cf68ba9ae76679ce6 (patch)
treea82df5b486b8d2fa86a68f7c2618a779b3cc368e
parent1b8edff21fe84d585f8707eddb87b4d67d7c31ff (diff)
parent5600f37ab5bbfed0fa6d782ec6d16f9fee511b62 (diff)
Merge "drm/msm/sde: Fix clang compilation in SDE driver"
-rw-r--r--drivers/gpu/drm/msm/sde/sde_plane.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/msm/sde/sde_plane.c b/drivers/gpu/drm/msm/sde/sde_plane.c
index 91c837ff13dc..ae66861c69d4 100644
--- a/drivers/gpu/drm/msm/sde/sde_plane.c
+++ b/drivers/gpu/drm/msm/sde/sde_plane.c
@@ -1871,7 +1871,7 @@ static void _sde_plane_install_properties(struct drm_plane *plane,
}
if (sde_is_custom_client()) {
- if (catalog->mixer_count && catalog->mixer &&
+ if (catalog->mixer_count &&
catalog->mixer[0].sblk->maxblendstages) {
zpos_max = catalog->mixer[0].sblk->maxblendstages - 1;
if (zpos_max > SDE_STAGE_MAX - SDE_STAGE_0 - 1)