Commit 7bad5d5c authored by Luca Coelho's avatar Luca Coelho
Browse files

drm/i915/display: convert W/As in intel_cursor.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-6-luciano.coelho@intel.com


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

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

+2 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include "intel_display.h"

#include "intel_display_types.h"

#include "intel_display_utils.h"

#include "intel_display_wa.h"

#include "intel_fb.h"

#include "intel_fb_pin.h"

#include "intel_frontbuffer.h"
@@ -424,7 +425,7 @@ static u32 i9xx_cursor_ctl(const struct intel_plane_state *plane_state) 
		cntl |= MCURSOR_ROTATE_180;



	/* Wa_22012358565:adl-p */

	if (DISPLAY_VER(display) == 13)

	if (intel_display_wa(display, INTEL_DISPLAY_WA_22012358565))

		cntl |= MCURSOR_ARB_SLOTS(1);



	return cntl;

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

+1 −0
Original line number Diff line number Diff line
@@ -85,6 +85,7 @@ bool __intel_display_wa(struct intel_display *display, enum intel_display_wa wa, 
			INTEL_PCH_TYPE(display) < PCH_DG1;

	case INTEL_DISPLAY_WA_14011503030:

	case INTEL_DISPLAY_WA_14011503117:

	case INTEL_DISPLAY_WA_22012358565:

		return DISPLAY_VER(display) == 13;

	case INTEL_DISPLAY_WA_14011508470:

		return (IS_DISPLAY_VERx100(display, 1200, 1300));

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

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ enum intel_display_wa { 
	INTEL_DISPLAY_WA_16025573575,

	INTEL_DISPLAY_WA_22010178259,

	INTEL_DISPLAY_WA_22011320316,

	INTEL_DISPLAY_WA_22012358565,

	INTEL_DISPLAY_WA_22014263786,

	INTEL_DISPLAY_WA_22021048059,

};