2021-08-21 08:54:34 +00:00
|
|
|
From 38643fd0a26ba42938a361db296e28f3b4975d8c Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Dom Cobley <popcornmix@gmail.com>
|
|
|
|
|
Date: Wed, 31 Mar 2021 18:12:55 +0100
|
|
|
|
|
Subject: [PATCH] vc4/drm: SQUASH: Fix source offsets with
|
|
|
|
|
DRM_FORMAT_P030
|
|
|
|
|
|
|
|
|
|
x_off should only be within current stripe
|
|
|
|
|
The stripe number is accounted for elsewhere
|
|
|
|
|
|
|
|
|
|
Fixes: 9b1b1beb1c7e58b ("vc4/drm: Fix source offsets with DRM_FORMAT_P030")
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Dom Cobley <popcornmix@gmail.com>
|
|
|
|
|
---
|
|
|
|
|
drivers/gpu/drm/vc4/vc4_plane.c | 5 +++--
|
|
|
|
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
|
|
|
|
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_plane.c
|
|
|
|
|
+++ b/drivers/gpu/drm/vc4/vc4_plane.c
|
2023-03-12 14:03:16 +00:00
|
|
|
@@ -828,8 +828,9 @@ static int vc4_plane_mode_set(struct drm
|
2021-08-21 08:54:34 +00:00
|
|
|
* and bits[3:0] should be between 0 and 11, indicating which
|
|
|
|
|
* of the 12-pixels in that 128-bit word is the first pixel to be used
|
|
|
|
|
*/
|
|
|
|
|
- u32 aligned = vc4_state->src_x / 12;
|
|
|
|
|
- u32 last_bits = vc4_state->src_x % 12;
|
|
|
|
|
+ u32 remaining_pixels = vc4_state->src_x % 96;
|
|
|
|
|
+ u32 aligned = remaining_pixels / 12;
|
|
|
|
|
+ u32 last_bits = remaining_pixels % 12;
|
|
|
|
|
|
|
|
|
|
x_off = aligned * 16 + last_bits;
|
|
|
|
|
hvs_format = HVS_PIXEL_FORMAT_YCBCR_10BIT;
|
