Commit 340db7c4 authored by Luca Coelho's avatar Luca Coelho
Browse files

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: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarSuraj Kandpal <suraj.kandpal@intel.com>
Link: https://patch.msgid.link/20260305100100.332956-17-luciano.coelho@intel.com


Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent de2a558e

drivers/gpu/drm/i915/display/intel_display_wa.c

+2 −0
Original line number Diff line number Diff line
@@ -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);

drivers/gpu/drm/i915/display/intel_display_wa.h

+1 −0
Original line number Diff line number Diff line
@@ -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,

drivers/gpu/drm/i915/display/skl_watermark.c

+2 −1
Original line number Diff line number Diff line
@@ -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);