X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Fbrcm2708%2Fpatches-4.19%2F950-0733-drm-vc4-Fix-negative-X-Y-positioning-on-SAND-planes.patch;fp=target%2Flinux%2Fbrcm2708%2Fpatches-4.19%2F950-0733-drm-vc4-Fix-negative-X-Y-positioning-on-SAND-planes.patch;h=8c8bb69e772cb7628974aeab7be3363785fb3472;hb=c2308a7e4adbb2acc8ff149f91d1ca46801c135e;hp=0000000000000000000000000000000000000000;hpb=67dcc43f3a22dc3a7ac07a7065971b426feeb043;p=openwrt%2Fopenwrt.git

diff --git a/target/linux/brcm2708/patches-4.19/950-0733-drm-vc4-Fix-negative-X-Y-positioning-on-SAND-planes.patch b/target/linux/brcm2708/patches-4.19/950-0733-drm-vc4-Fix-negative-X-Y-positioning-on-SAND-planes.patch
new file mode 100644
index 0000000000..8c8bb69e77
--- /dev/null
+++ b/target/linux/brcm2708/patches-4.19/950-0733-drm-vc4-Fix-negative-X-Y-positioning-on-SAND-planes.patch
@@ -0,0 +1,68 @@
+From a8af2085e26bcefad8fb65e2b44d12777a84e219 Mon Sep 17 00:00:00 2001
+From: Boris Brezillon <boris.brezillon@bootlin.com>
+Date: Fri, 7 Dec 2018 09:36:05 +0100
+Subject: [PATCH] drm/vc4: Fix negative X/Y positioning on SAND planes
+
+Commit 8e75d582db02bcb171d65ec71eecbd3072a5fd3a upstream.
+
+Commit 3e407417b192 ("drm/vc4: Fix X/Y positioning of planes using
+T_TILES modifier") fixed the problem with T_TILES format, but left
+things in a non-working state for SAND formats. Address that now.
+
+Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
+Reviewed-by: Eric Anholt <eric@anholt.net>
+Link: https://patchwork.freedesktop.org/patch/msgid/20181207083606.15449-1-boris.brezillon@bootlin.com
+---
+ drivers/gpu/drm/vc4/vc4_plane.c | 21 +++++++++++++++++++++
+ 1 file changed, 21 insertions(+)
+
+--- a/drivers/gpu/drm/vc4/vc4_plane.c
++++ b/drivers/gpu/drm/vc4/vc4_plane.c
+@@ -684,6 +684,7 @@ static int vc4_plane_mode_set(struct drm
+ 	case DRM_FORMAT_MOD_BROADCOM_SAND128:
+ 	case DRM_FORMAT_MOD_BROADCOM_SAND256: {
+ 		uint32_t param = fourcc_mod_broadcom_param(fb->modifier);
++		u32 tile_w, tile, x_off, pix_per_tile;
+ 
+ 		/* Column-based NV12 or RGBA.
+ 		 */
+@@ -703,12 +704,15 @@ static int vc4_plane_mode_set(struct drm
+ 		switch (base_format_mod) {
+ 		case DRM_FORMAT_MOD_BROADCOM_SAND64:
+ 			tiling = SCALER_CTL0_TILING_64B;
++			tile_w = 64;
+ 			break;
+ 		case DRM_FORMAT_MOD_BROADCOM_SAND128:
+ 			tiling = SCALER_CTL0_TILING_128B;
++			tile_w = 128;
+ 			break;
+ 		case DRM_FORMAT_MOD_BROADCOM_SAND256:
+ 			tiling = SCALER_CTL0_TILING_256B_OR_T;
++			tile_w = 256;
+ 			break;
+ 		default:
+ 			break;
+@@ -719,6 +723,23 @@ static int vc4_plane_mode_set(struct drm
+ 			return -EINVAL;
+ 		}
+ 
++		pix_per_tile = tile_w / fb->format->cpp[0];
++		tile = vc4_state->src_x / pix_per_tile;
++		x_off = vc4_state->src_x % pix_per_tile;
++
++		/* Adjust the base pointer to the first pixel to be scanned
++		 * out.
++		 */
++		for (i = 0; i < num_planes; i++) {
++			vc4_state->offsets[i] += param * tile_w * tile;
++			vc4_state->offsets[i] += vc4_state->src_y /
++						 (i ? v_subsample : 1) *
++						 tile_w;
++			vc4_state->offsets[i] += x_off /
++						 (i ? h_subsample : 1) *
++						 fb->format->cpp[i];
++		}
++
+ 		pitch0 = VC4_SET_FIELD(param, SCALER_TILE_HEIGHT);
+ 		break;
+ 	}