drm/i915/fbc: Apply Wa_15018326506

Disable FBC in bmg as per the wa recommendation.

v2: use the bmg platform instead of a specific stepping

v3: wa to Wa

Bspec: 74212
Signed-off-by: Vinod Govindapillai <vinod.govindapillai@intel.com>
Reviewed-by: Mika Kahola <mika.kahola@intel.com>
Acked-by: Uma Shankar <uma.shankar@intel.com>
Link: https://patch.msgid.link/20251111124606.402380-1-vinod.govindapillai@intel.com
Signed-off-by: Vinod Govindapillai <vinod.govindapillai@intel.com>

diff --git a/drivers/gpu/drm/i915/display/intel_display_wa.c b/drivers/gpu/drm/i915/display/intel_display_wa.c
index e38e5e87877c29bcd9073497a9f08eb5ba9e7174..b2e71fa61c0abc90302554de23da7e0816ed46bf 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_wa.c
+++ b/drivers/gpu/drm/i915/display/intel_display_wa.c
@@ -70,6 +70,8 @@ bool __intel_display_wa(struct intel_display *display, enum intel_display_wa wa,
                return DISPLAY_VER(display) == 13;
        case INTEL_DISPLAY_WA_22014263786:
                return IS_DISPLAY_VERx100(display, 1100, 1400);
+       case INTEL_DISPLAY_WA_15018326506:
+               return display->platform.battlemage;
        default:
                drm_WARN(display->drm, 1, "Missing Wa number: %s\n", name);
                break;

diff --git a/drivers/gpu/drm/i915/display/intel_display_wa.h b/drivers/gpu/drm/i915/display/intel_display_wa.h
index 3644e8e2b7245a5b8b2db9de7743b3fadbdb3706..f648b00cb97d3fc4a391833f727df34174ea12db 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_wa.h
+++ b/drivers/gpu/drm/i915/display/intel_display_wa.h
@@ -26,6 +26,7 @@ enum intel_display_wa {
        INTEL_DISPLAY_WA_16025573575,
        INTEL_DISPLAY_WA_14011503117,
        INTEL_DISPLAY_WA_22014263786,
+       INTEL_DISPLAY_WA_15018326506,
 };
 
 bool __intel_display_wa(struct intel_display *display, enum intel_display_wa wa, const char *name);

diff --git a/drivers/gpu/drm/i915/display/intel_fbc.c b/drivers/gpu/drm/i915/display/intel_fbc.c
index 437d2fda20a7e768a779159c76010131e00faad4..205c7266af4354f4dc35fe3246c9d4868e0c05de 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_fbc.c
+++ b/drivers/gpu/drm/i915/display/intel_fbc.c
@@ -1521,6 +1521,16 @@ static int intel_fbc_check_plane(struct intel_atomic_state *state,
                return 0;
        }
 
+       /*
+        * Wa_15018326506:
+        * Fixes: Underrun during media decode
+        * Workaround: Do not enable FBC
+        */
+       if (intel_display_wa(display, 15018326506)) {
+               plane_state->no_fbc_reason = "Wa_15018326506";
+               return 0;
+       }
+
        /* WaFbcTurnOffFbcWhenHyperVisorIsUsed:skl,bxt */
        if (intel_display_vtd_active(display) &&
            (display->platform.skylake || display->platform.broxton)) {