Browse Source

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>
Mihail Atanassov 8 years ago
parent
commit
c7ffa59cf0
1 changed files with 2 additions and 1 deletions
  1. 2 1
      drivers/gpu/drm/arm/malidp_planes.c

+ 2 - 1
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 */
 	/* setup the rotation and axis flip bits */
 	if (plane->state->rotation & DRM_ROTATE_MASK)
 	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)
 	if (plane->state->rotation & DRM_REFLECT_X)
 		val |= LAYER_H_FLIP;
 		val |= LAYER_H_FLIP;
 	if (plane->state->rotation & DRM_REFLECT_Y)
 	if (plane->state->rotation & DRM_REFLECT_Y)