summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorBoris Brezillon <boris.brezillon@bootlin.com>2018-07-24 15:36:01 +0200
committerBoris Brezillon <boris.brezillon@bootlin.com>2018-07-25 21:15:24 +0200
commita6a00918d4ad8718c3ccde38c02cec17f116b2fd (patch)
tree85e34f4c030ee20ed7b9acad5a9842c7039a3fdf /drivers
parentde2d8db395c32d121d02871819444b631f73e0b6 (diff)
downloadlinux-stable-a6a00918d4ad8718c3ccde38c02cec17f116b2fd.tar.gz
linux-stable-a6a00918d4ad8718c3ccde38c02cec17f116b2fd.tar.bz2
linux-stable-a6a00918d4ad8718c3ccde38c02cec17f116b2fd.zip
drm/vc4: Reset ->{x, y}_scaling[1] when dealing with uniplanar formats
This is needed to ensure ->is_unity is correct when the plane was previously configured to output a multi-planar format with scaling enabled, and is then being reconfigured to output a uniplanar format. Fixes: fc04023fafec ("drm/vc4: Add support for YUV planes.") Cc: <stable@vger.kernel.org> Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com> Reviewed-by: Eric Anholt <eric@anholt.net> Link: https://patchwork.freedesktop.org/patch/msgid/20180724133601.32114-1-boris.brezillon@bootlin.com
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/vc4/vc4_plane.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c
index 1d34619eb3fe..a951ec75d01f 100644
--- a/drivers/gpu/drm/vc4/vc4_plane.c
+++ b/drivers/gpu/drm/vc4/vc4_plane.c
@@ -320,6 +320,9 @@ static int vc4_plane_setup_clipping_and_scaling(struct drm_plane_state *state)
vc4_state->x_scaling[0] = VC4_SCALING_TPZ;
if (vc4_state->y_scaling[0] == VC4_SCALING_NONE)
vc4_state->y_scaling[0] = VC4_SCALING_TPZ;
+ } else {
+ vc4_state->x_scaling[1] = VC4_SCALING_NONE;
+ vc4_state->y_scaling[1] = VC4_SCALING_NONE;
}
vc4_state->is_unity = (vc4_state->x_scaling[0] == VC4_SCALING_NONE &&