diff options
| author | Luca Coelho <luciano.coelho@intel.com> | 2026-03-05 12:59:18 +0300 |
|---|---|---|
| committer | Luca Coelho <luciano.coelho@intel.com> | 2026-03-09 13:32:49 +0300 |
| commit | de2a558e76a5877d5a1765d5b00e59610e855c9e (patch) | |
| tree | 417909a8ac355a77d8c14db7619ba9772439ab27 | |
| parent | bbcf7efbd1b6dc53af08ef022e95c7e372d65f0b (diff) | |
| download | linux-de2a558e76a5877d5a1765d5b00e59610e855c9e.tar.xz | |
drm/i915/display: convert W/As in skl_universal_plane.c to new framework
Convert the low-hanging fruits of workaround checks to the workaround
framework. Instead of having display structure checks for the
workarounds all over, concentrate the checks in intel_display_wa.c.
Acked-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Suraj Kandpal <suraj.kandpal@intel.com>
Link: https://patch.msgid.link/20260305100100.332956-16-luciano.coelho@intel.com
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_display_wa.c | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_display_wa.h | 1 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/skl_universal_plane.c | 6 |
3 files changed, 8 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_display_wa.c b/drivers/gpu/drm/i915/display/intel_display_wa.c index 73c7b87d5ecd..f05d96b4b35f 100644 --- a/drivers/gpu/drm/i915/display/intel_display_wa.c +++ b/drivers/gpu/drm/i915/display/intel_display_wa.c @@ -79,6 +79,10 @@ bool __intel_display_wa(struct intel_display *display, enum intel_display_wa wa, case INTEL_DISPLAY_WA_13012396614: return DISPLAY_VERx100(display) == 3000 || DISPLAY_VERx100(display) == 3500; + case INTEL_DISPLAY_WA_14010477008: + return display->platform.dg1 || display->platform.rocketlake || + (display->platform.tigerlake && + IS_DISPLAY_STEP(display, STEP_A0, STEP_D0)); case INTEL_DISPLAY_WA_14010480278: return (IS_DISPLAY_VER(display, 10, 12)); case INTEL_DISPLAY_WA_14010547955: diff --git a/drivers/gpu/drm/i915/display/intel_display_wa.h b/drivers/gpu/drm/i915/display/intel_display_wa.h index 0e9959760b9f..1f664366847d 100644 --- a/drivers/gpu/drm/i915/display/intel_display_wa.h +++ b/drivers/gpu/drm/i915/display/intel_display_wa.h @@ -30,6 +30,7 @@ enum intel_display_wa { INTEL_DISPLAY_WA_1409120013, INTEL_DISPLAY_WA_1409767108, INTEL_DISPLAY_WA_13012396614, + INTEL_DISPLAY_WA_14010477008, INTEL_DISPLAY_WA_14010480278, INTEL_DISPLAY_WA_14010547955, INTEL_DISPLAY_WA_14010685332, diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c b/drivers/gpu/drm/i915/display/skl_universal_plane.c index 677f1339b7f8..11ba42c67e3e 100644 --- a/drivers/gpu/drm/i915/display/skl_universal_plane.c +++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c @@ -17,6 +17,7 @@ #include "intel_display_regs.h" #include "intel_display_types.h" #include "intel_display_utils.h" +#include "intel_display_wa.h" #include "intel_fb.h" #include "intel_fbc.h" #include "intel_frontbuffer.h" @@ -1216,7 +1217,7 @@ static u32 skl_plane_ctl(const struct intel_plane_state *plane_state) plane_ctl |= PLANE_CTL_KEY_ENABLE_SOURCE; /* Wa_22012358565:adl-p */ - if (DISPLAY_VER(display) == 13) + if (intel_display_wa(display, INTEL_DISPLAY_WA_22012358565)) plane_ctl |= adlp_plane_ctl_arb_slots(plane_state); return plane_ctl; @@ -2792,8 +2793,7 @@ static bool tgl_plane_has_mc_ccs(struct intel_display *display, enum plane_id plane_id) { /* Wa_14010477008 */ - if (display->platform.dg1 || display->platform.rocketlake || - (display->platform.tigerlake && IS_DISPLAY_STEP(display, STEP_A0, STEP_D0))) + if (intel_display_wa(display, INTEL_DISPLAY_WA_14010477008)) return false; return plane_id < PLANE_6; |