diff options
| author | Luca Coelho <luciano.coelho@intel.com> | 2026-03-05 11:59:19 +0200 |
|---|---|---|
| committer | Luca Coelho <luciano.coelho@intel.com> | 2026-03-09 12:32:49 +0200 |
| commit | 340db7c4d9dfa86cce3cb8f68e68115cadae8d51 (patch) | |
| tree | 21ae749a8393ee2bd22164c8db276842d3d605ca /drivers/gpu/drm | |
| parent | de2a558e76a5877d5a1765d5b00e59610e855c9e (diff) | |
drm/i915/display: convert W/As in skl_watermark.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-17-luciano.coelho@intel.com
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Diffstat (limited to 'drivers/gpu/drm')
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_display_wa.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_display_wa.h | 1 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/skl_watermark.c | 3 |
3 files changed, 5 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_display_wa.c b/drivers/gpu/drm/i915/display/intel_display_wa.c index f05d96b4b35f..081a4092cd13 100644 --- a/drivers/gpu/drm/i915/display/intel_display_wa.c +++ b/drivers/gpu/drm/i915/display/intel_display_wa.c @@ -142,6 +142,8 @@ bool __intel_display_wa(struct intel_display *display, enum intel_display_wa wa, IS_DISPLAY_STEP(display, STEP_A0, STEP_B0)); case INTEL_DISPLAY_WA_22010178259: return DISPLAY_VER(display) == 12; + case INTEL_DISPLAY_WA_22010947358: + return display->platform.alderlake_p; case INTEL_DISPLAY_WA_22012278275: return display->platform.alderlake_p && IS_DISPLAY_STEP(display, STEP_A0, STEP_E0); diff --git a/drivers/gpu/drm/i915/display/intel_display_wa.h b/drivers/gpu/drm/i915/display/intel_display_wa.h index 1f664366847d..15fec843f15e 100644 --- a/drivers/gpu/drm/i915/display/intel_display_wa.h +++ b/drivers/gpu/drm/i915/display/intel_display_wa.h @@ -54,6 +54,7 @@ enum intel_display_wa { INTEL_DISPLAY_WA_16025596647, INTEL_DISPLAY_WA_18034343758, INTEL_DISPLAY_WA_22010178259, + INTEL_DISPLAY_WA_22010947358, INTEL_DISPLAY_WA_22011320316, INTEL_DISPLAY_WA_22012278275, INTEL_DISPLAY_WA_22012358565, diff --git a/drivers/gpu/drm/i915/display/skl_watermark.c b/drivers/gpu/drm/i915/display/skl_watermark.c index a520d492317b..b1f9546b8cda 100644 --- a/drivers/gpu/drm/i915/display/skl_watermark.c +++ b/drivers/gpu/drm/i915/display/skl_watermark.c @@ -22,6 +22,7 @@ #include "intel_display_rpm.h" #include "intel_display_types.h" #include "intel_display_utils.h" +#include "intel_display_wa.h" #include "intel_dram.h" #include "intel_fb.h" #include "intel_fixed.h" @@ -3412,7 +3413,7 @@ static u32 pipe_mbus_dbox_ctl(const struct intel_crtc *crtc, if (DISPLAY_VER(display) >= 14) val |= dbuf_state->joined_mbus ? MBUS_DBOX_A_CREDIT(12) : MBUS_DBOX_A_CREDIT(8); - else if (display->platform.alderlake_p) + else if (intel_display_wa(display, INTEL_DISPLAY_WA_22010947358)) /* Wa_22010947358:adl-p */ val |= dbuf_state->joined_mbus ? MBUS_DBOX_A_CREDIT(6) : MBUS_DBOX_A_CREDIT(4); |