41 lines
1.6 KiB
Diff
41 lines
1.6 KiB
Diff
|
From patchwork Tue Jul 24 13:36:01 2018
|
||
|
|
Content-Type: text/plain; charset="utf-8"
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Transfer-Encoding: 7bit
|
||
|
|
Subject: drm/vc4: Reset ->{x, y}_scaling[1] when dealing with uniplanar formats
|
||
|
|
From: Boris Brezillon <boris.brezillon@bootlin.com>
|
||
|
|
X-Patchwork-Id: 240644
|
||
|
|
Message-Id: <20180724133601.32114-1-boris.brezillon@bootlin.com>
|
||
|
|
To: Eric Anholt <eric@anholt.net>
|
||
|
|
Cc: David Airlie <airlied@linux.ie>,
|
||
|
|
Boris Brezillon <boris.brezillon@bootlin.com>, stable@vger.kernel.org,
|
||
|
|
dri-devel@lists.freedesktop.org
|
||
|
|
Date: Tue, 24 Jul 2018 15:36:01 +0200
|
||
|
|
|
||
|
|
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>
|
||
|
|
---
|
||
|
|
drivers/gpu/drm/vc4/vc4_plane.c | 3 +++
|
||
|
|
1 file changed, 3 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c
|
||
|
|
index 9d7a36f148cf..cfb50fedfa2b 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 &&
|