From ffaaf0cc49049d8ac0c5fe592638d4b0ad8992ff Mon Sep 17 00:00:00 2001 From: jsg Date: Mon, 1 Jan 2024 23:58:00 +0000 Subject: [PATCH] drm/i915: Fix ADL+ tiled plane stride when the POT stride is smaller than the original From Ville Syrjala 900c1b3c62f920a50352f5dff6995bca5836b0c7 in linux-6.1.y/6.1.70 324b70e997aab0a7deab8cb90711faccda4e98c8 in mainline linux --- sys/dev/pci/drm/i915/display/intel_fb.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/dev/pci/drm/i915/display/intel_fb.c b/sys/dev/pci/drm/i915/display/intel_fb.c index 99ee0e69e99..2a3e37c42f7 100644 --- a/sys/dev/pci/drm/i915/display/intel_fb.c +++ b/sys/dev/pci/drm/i915/display/intel_fb.c @@ -1316,7 +1316,8 @@ plane_view_scanout_stride(const struct intel_framebuffer *fb, int color_plane, struct drm_i915_private *i915 = to_i915(fb->base.dev); unsigned int stride_tiles; - if (IS_ALDERLAKE_P(i915) || DISPLAY_VER(i915) >= 14) + if ((IS_ALDERLAKE_P(i915) || DISPLAY_VER(i915) >= 14) && + src_stride_tiles < dst_stride_tiles) stride_tiles = src_stride_tiles; else stride_tiles = dst_stride_tiles; -- 2.20.1