From: Ville Syrjälä <[email protected]>

There's some kind of weird corner cases in FBC which requires
FBC segments to be separated by at least one extra cacheline.
Make sure that is present.

v2: Respin to fit in with skl_fbc_min_cfb_stride()

Reviewed-by: Juha-Pekka Heikkila <[email protected]> #v1
Signed-off-by: Ville Syrjälä <[email protected]>
---
 drivers/gpu/drm/i915/display/intel_fbc.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/drivers/gpu/drm/i915/display/intel_fbc.c 
b/drivers/gpu/drm/i915/display/intel_fbc.c
index ff05eb83e204..1e7d86f04fe9 100644
--- a/drivers/gpu/drm/i915/display/intel_fbc.c
+++ b/drivers/gpu/drm/i915/display/intel_fbc.c
@@ -94,6 +94,13 @@ static unsigned int skl_fbc_min_cfb_stride(const struct 
intel_fbc_state_cache *c
        /* minimum segment stride we can use */
        stride = cache->plane.src_w * cpp * height / limit;
 
+       /*
+        * Wa_16011863758: icl+
+        * Avoid some hardware segment address miscalculation.
+        */
+       if (DISPLAY_VER(i915) >= 11)
+               stride += 64;
+
        /*
         * At least some of the platforms require each 4 line segment to
         * be 512 byte aligned. Just do it always for simplicity.
-- 
2.32.0

Reply via email to