Commit ca1e2a83 authored by Daniele Ceraolo Spurio's avatar Daniele Ceraolo Spurio Committed by John Harrison
Browse files

drm/i915/guc: Enable WA 14018913170 



The GuC handles the WA, the KMD just needs to set the flag to enable
it on the appropriate platforms.

Signed-off-by: default avatarJohn Harrison <John.C.Harrison@Intel.com>
Signed-off-by: default avatarDaniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Reviewed-by: default avatarVinay Belgaumkar <vinay.belgaumkar@intel.com>
Reviewed-by: default avatarAndi Shyti <andi.shyti@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20231006013553.1339418-1-John.C.Harrison@Intel.com
parent 3e78f771

drivers/gpu/drm/i915/gt/uc/intel_guc.c

+6 −0
Original line number Diff line number Diff line
@@ -319,6 +319,12 @@ static u32 guc_ctl_wa_flags(struct intel_guc *guc) 
	if (!RCS_MASK(gt))

		flags |= GUC_WA_RCS_REGS_IN_CCS_REGS_LIST;



	/* Wa_14018913170 */

	if (GUC_FIRMWARE_VER(guc) >= MAKE_GUC_VER(70, 7, 0)) {

		if (IS_DG2(gt->i915) || IS_METEORLAKE(gt->i915) || IS_PONTEVECCHIO(gt->i915))

			flags |= GUC_WA_ENABLE_TSC_CHECK_ON_RC6;

	}



	return flags;

}

drivers/gpu/drm/i915/gt/uc/intel_guc.h

+1 −0
Original line number Diff line number Diff line
@@ -295,6 +295,7 @@ struct intel_guc { 
#define MAKE_GUC_VER(maj, min, pat)	(((maj) << 16) | ((min) << 8) | (pat))

#define MAKE_GUC_VER_STRUCT(ver)	MAKE_GUC_VER((ver).major, (ver).minor, (ver).patch)

#define GUC_SUBMIT_VER(guc)		MAKE_GUC_VER_STRUCT((guc)->submission_version)

#define GUC_FIRMWARE_VER(guc)		MAKE_GUC_VER_STRUCT((guc)->fw.file_selected.ver)



static inline struct intel_guc *log_to_guc(struct intel_guc_log *log)

{

drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h

+1 −0
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ 
#define   GUC_WA_HOLD_CCS_SWITCHOUT	BIT(17)

#define   GUC_WA_POLLCS			BIT(18)

#define   GUC_WA_RCS_REGS_IN_CCS_REGS_LIST	BIT(21)

#define   GUC_WA_ENABLE_TSC_CHECK_ON_RC6	BIT(22)



#define GUC_CTL_FEATURE			2

#define   GUC_CTL_ENABLE_SLPC		BIT(2)