Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e79a2db2 authored by Boris Brezillon's avatar Boris Brezillon Committed by Greg Kroah-Hartman
Browse files

drm/vc4: Reset ->{x, y}_scaling[1] when dealing with uniplanar formats 



commit a6a00918d4ad8718c3ccde38c02cec17f116b2fd upstream.

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: fc04023f ("drm/vc4: Add support for YUV planes.")
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarBoris Brezillon <boris.brezillon@bootlin.com>
Reviewed-by: default avatarEric Anholt <eric@anholt.net>
Link: https://patchwork.freedesktop.org/patch/msgid/20180724133601.32114-1-boris.brezillon@bootlin.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 804f510b

drivers/gpu/drm/vc4/vc4_plane.c

+3 −0
Original line number Diff line number Diff line
@@ -350,6 +350,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 &&