| From foo@baz Thu Nov 9 09:48:01 CET 2017 |
| From: Mihail Atanassov <mihail.atanassov@arm.com> |
| Date: Fri, 23 Dec 2016 09:57:20 +0000 |
| Subject: drm: mali-dp: fix Lx_CONTROL register fields clobber |
| |
| From: Mihail Atanassov <mihail.atanassov@arm.com> |
| |
| |
| [ Upstream commit c7ffa59cf03c38b91d6ef01e42c1b52fd7a4f285 ] |
| |
| 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> |
| Signed-off-by: Sasha Levin <alexander.levin@verizon.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/gpu/drm/arm/malidp_planes.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| --- a/drivers/gpu/drm/arm/malidp_planes.c |
| +++ b/drivers/gpu/drm/arm/malidp_planes.c |
| @@ -182,7 +182,8 @@ static void malidp_de_plane_update(struc |
| |
| /* 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) |
