As per the WA, fbc stride need to be programmed always for bmg.
Display driver handles the need to program the fbc stride using
the override stride. So ensure that we always get the override
stride in case of bmg

v2: re-phrase the commit message.

Bspec: 74212
Signed-off-by: Vinod Govindapillai <vinod.govindapil...@intel.com>
Reviewed-by: Juha-Pekka Heikkila <juhapekka.heikk...@gmail.com>
---
 drivers/gpu/drm/i915/display/intel_fbc.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/display/intel_fbc.c 
b/drivers/gpu/drm/i915/display/intel_fbc.c
index ce5b1e3f1c20..bed2bba20b55 100644
--- a/drivers/gpu/drm/i915/display/intel_fbc.c
+++ b/drivers/gpu/drm/i915/display/intel_fbc.c
@@ -252,9 +252,12 @@ static u16 intel_fbc_override_cfb_stride(const struct 
intel_plane_state *plane_s
         * Gen9 hw miscalculates cfb stride for linear as
         * PLANE_STRIDE*512 instead of PLANE_STRIDE*64, so
         * we always need to use the override there.
+        *
+        * wa_14022269668 For bmg, always program the FBC_STRIDE before fbc 
enable
         */
        if (stride != stride_aligned ||
-           (DISPLAY_VER(display) == 9 && fb->modifier == 
DRM_FORMAT_MOD_LINEAR))
+           (DISPLAY_VER(display) == 9 && fb->modifier == 
DRM_FORMAT_MOD_LINEAR) ||
+           display->platform.battlemage)
                return stride_aligned * 4 / 64;
 
        return 0;
-- 
2.43.0

Reply via email to