From 8299d1f057439f94c6a4412e2e5c5082b82a30c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= Date: Sat, 21 Aug 2021 10:54:34 +0200 Subject: bcm27xx: add kernel 5.10 support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Rebased RPi foundation patches on linux 5.10.59, removed applied and reverted patches, wireless patches and defconfig patches. bcm2708: boot tested on RPi B+ v1.2 bcm2709: boot tested on RPi 4B v1.1 4G bcm2711: boot tested on RPi 4B v1.1 4G Signed-off-by: Álvaro Fernández Rojas --- ...m-Fix-source-offsets-with-DRM_FORMAT_P030.patch | 71 ++++++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 target/linux/bcm27xx/patches-5.10/950-0511-vc4-drm-Fix-source-offsets-with-DRM_FORMAT_P030.patch (limited to 'target/linux/bcm27xx/patches-5.10/950-0511-vc4-drm-Fix-source-offsets-with-DRM_FORMAT_P030.patch') diff --git a/target/linux/bcm27xx/patches-5.10/950-0511-vc4-drm-Fix-source-offsets-with-DRM_FORMAT_P030.patch b/target/linux/bcm27xx/patches-5.10/950-0511-vc4-drm-Fix-source-offsets-with-DRM_FORMAT_P030.patch new file mode 100644 index 0000000000..b156c9072e --- /dev/null +++ b/target/linux/bcm27xx/patches-5.10/950-0511-vc4-drm-Fix-source-offsets-with-DRM_FORMAT_P030.patch @@ -0,0 +1,71 @@ +From c470db2240fa76293025852533ae8bf1c5679bfb Mon Sep 17 00:00:00 2001 +From: Dom Cobley +Date: Mon, 22 Mar 2021 19:43:48 +0000 +Subject: [PATCH] vc4/drm: Fix source offsets with DRM_FORMAT_P030 + +Spec says: bits [31:4] of the given address should point to +the 128-bit word containing the desired starting pixel, +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 + +Signed-off-by: Dom Cobley +--- + drivers/gpu/drm/vc4/vc4_plane.c | 24 ++++++++++++++++-------- + 1 file changed, 16 insertions(+), 8 deletions(-) + +--- a/drivers/gpu/drm/vc4/vc4_plane.c ++++ b/drivers/gpu/drm/vc4/vc4_plane.c +@@ -824,9 +824,20 @@ static int vc4_plane_mode_set(struct drm + u32 tile_w, tile, x_off, pix_per_tile; + + if (fb->format->format == DRM_FORMAT_P030) { ++ /* ++ * Spec says: bits [31:4] of the given address should point to ++ * the 128-bit word containing the desired starting pixel, ++ * 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; ++ ++ x_off = aligned * 16 + last_bits; + hvs_format = HVS_PIXEL_FORMAT_YCBCR_10BIT; + tiling = SCALER_CTL0_TILING_128B; +- tile_w = 96; ++ tile_w = 128; ++ pix_per_tile = 96; + } else { + hvs_format = HVS_PIXEL_FORMAT_H264; + +@@ -846,17 +857,16 @@ static int vc4_plane_mode_set(struct drm + default: + break; + } ++ pix_per_tile = tile_w / fb->format->cpp[0]; ++ x_off = (vc4_state->src_x % pix_per_tile) / ++ (i ? h_subsample : 1) * fb->format->cpp[i]; + } + if (param > SCALER_TILE_HEIGHT_MASK) { + DRM_DEBUG_KMS("SAND height too large (%d)\n", + param); + 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. + * +@@ -872,9 +882,7 @@ static int vc4_plane_mode_set(struct drm + vc4_state->offsets[i] += src_y / + (i ? v_subsample : 1) * + tile_w; +- vc4_state->offsets[i] += x_off / +- (i ? h_subsample : 1) * +- fb->format->cpp[i]; ++ vc4_state->offsets[i] += x_off & ~(i ? 1 : 0); + } + + pitch0 = VC4_SET_FIELD(param, SCALER_TILE_HEIGHT); -- cgit v1.2.3