]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
drm/vc4: Set ->is_yuv to false when num_planes == 1
authorBoris Brezillon <boris.brezillon@bootlin.com>
Tue, 9 Oct 2018 13:24:46 +0000 (15:24 +0200)
committerBoris Brezillon <boris.brezillon@bootlin.com>
Wed, 24 Oct 2018 16:14:33 +0000 (18:14 +0200)
When vc4_plane_state is duplicated ->is_yuv is left assigned to its
previous value, and we never set it back to false when switching to
a non-YUV format.

Fix that by setting ->is_yuv to false in the 'num_planes == 1' branch
of the vc4_plane_setup_clipping_and_scaling() function.

Fixes: fc04023fafecf ("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/20181009132446.21960-1-boris.brezillon@bootlin.com
drivers/gpu/drm/vc4/vc4_plane.c

index d93045fee7b31db651fe9ed17fcec3a289f9b22d..98fae4daa08c312e6ec1ed19cee8c52597389ae0 100644 (file)
@@ -348,6 +348,7 @@ static int vc4_plane_setup_clipping_and_scaling(struct drm_plane_state *state)
                if (vc4_state->is_unity)
                        vc4_state->x_scaling[0] = VC4_SCALING_PPF;
        } else {
+               vc4_state->is_yuv = false;
                vc4_state->x_scaling[1] = VC4_SCALING_NONE;
                vc4_state->y_scaling[1] = VC4_SCALING_NONE;
        }