Commit 275dac1f authored by John Harrison's avatar John Harrison Committed by Joonas Lahtinen
Browse files

drm/i915/guc: Don't capture Gen8 regs on Xe devices 



A pair of pre-Xe registers were being included in the Xe capture list.
GuC was rejecting those as being invalid and logging errors about
them. So, stop doing it.

Signed-off-by: default avatarJohn Harrison <John.C.Harrison@Intel.com>
Reviewed-by: default avatarAlan Previn <alan.previn.teres.alexis@intel.com>
Fixes: dce2bd54 ("drm/i915/guc: Add Gen9 registers for GuC error state capture.")
Cc: Alan Previn <alan.previn.teres.alexis@intel.com>
Cc: Umesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Cc: John Harrison <John.C.Harrison@Intel.com>
Cc: Jani Nikula <jani.nikula@intel.com>
Cc: Matt Roper <matthew.d.roper@intel.com>
Cc: Balasubramani Vivekanandan <balasubramani.vivekanandan@intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230428185636.457407-2-John.C.Harrison@Intel.com


(cherry picked from commit b049132d)
Signed-off-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
parent ac9a7868

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

+5 −2
Original line number Diff line number Diff line
@@ -31,12 +31,14 @@ 
	{ FORCEWAKE_MT,             0,      0, "FORCEWAKE" }



#define COMMON_GEN9BASE_GLOBAL \

	{ GEN8_FAULT_TLB_DATA0,     0,      0, "GEN8_FAULT_TLB_DATA0" }, \

	{ GEN8_FAULT_TLB_DATA1,     0,      0, "GEN8_FAULT_TLB_DATA1" }, \

	{ ERROR_GEN6,               0,      0, "ERROR_GEN6" }, \

	{ DONE_REG,                 0,      0, "DONE_REG" }, \

	{ HSW_GTT_CACHE_EN,         0,      0, "HSW_GTT_CACHE_EN" }



#define GEN9_GLOBAL \

	{ GEN8_FAULT_TLB_DATA0,     0,      0, "GEN8_FAULT_TLB_DATA0" }, \

	{ GEN8_FAULT_TLB_DATA1,     0,      0, "GEN8_FAULT_TLB_DATA1" }



#define COMMON_GEN12BASE_GLOBAL \

	{ GEN12_FAULT_TLB_DATA0,    0,      0, "GEN12_FAULT_TLB_DATA0" }, \

	{ GEN12_FAULT_TLB_DATA1,    0,      0, "GEN12_FAULT_TLB_DATA1" }, \
@@ -142,6 +144,7 @@ static const struct __guc_mmio_reg_descr xe_lpd_gsc_inst_regs[] = { 
static const struct __guc_mmio_reg_descr default_global_regs[] = {

	COMMON_BASE_GLOBAL,

	COMMON_GEN9BASE_GLOBAL,

	GEN9_GLOBAL,

};



static const struct __guc_mmio_reg_descr default_rc_class_regs[] = {