drm: mali-dp: fix Lx_CONTROL register fields clobber

When updating the rotation fields, one of the assignments zeroes out the
rest of the register fields, which include settings for chroma siting,
inverse gamma, AMBA AXI caching, and alpha blending.

Signed-off-by: Mihail Atanassov <mihail.atanassov@arm.com>
Signed-off-by: Liviu Dudau <Liviu.Dudau@arm.com>

diff --git a/drivers/gpu/drm/arm/malidp_planes.c b/drivers/gpu/drm/arm/malidp_planes.c
index 629f634872a4bc6eb17027552bc2f05585726412..1db8b6977efc2960377978e0febfa0e3b980d72f 100644 (file)
--- a/drivers/gpu/drm/arm/malidp_planes.c
+++ b/drivers/gpu/drm/arm/malidp_planes.c
@@ -219,7 +219,8 @@ static void malidp_de_plane_update(struct drm_plane *plane,
 
        /* setup the rotation and axis flip bits */
        if (plane->state->rotation & DRM_ROTATE_MASK)
-               val = ilog2(plane->state->rotation & DRM_ROTATE_MASK) << LAYER_ROT_OFFSET;
+               val |= ilog2(plane->state->rotation & DRM_ROTATE_MASK) <<
+                      LAYER_ROT_OFFSET;
        if (plane->state->rotation & DRM_REFLECT_X)
                val |= LAYER_H_FLIP;
        if (plane->state->rotation & DRM_REFLECT_Y)