Commit 8df23e4c authored by John Harrison's avatar John Harrison Committed by Jani Nikula
Browse files

drm/i915/guc: Fix missing ecodes 



Error captures are tagged with an 'ecode'. This is a pseduo-unique magic
number that is meant to distinguish similar seeming bugs with
different underlying signatures. It is a combination of two ring state
registers. Unfortunately, the register state being used is only valid
in execlist mode. In GuC mode, the register state exists in a separate
list of arbitrary register address/value pairs rather than the named
entry structure. So, search through that list to find the two exciting
registers and copy them over to the structure's named members.

v2: if else if instead of if if (Alan)

Signed-off-by: default avatarJohn Harrison <John.C.Harrison@Intel.com>
Reviewed-by: default avatarAlan Previn <alan.previn.teres.alexis@intel.com>
Fixes: a6f0f9cf ("drm/i915/guc: Plumb GuC-capture into gpu_coredump")
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: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Cc: Matt Roper <matthew.d.roper@intel.com>
Cc: Aravind Iddamsetty <aravind.iddamsetty@intel.com>
Cc: Michael Cheng <michael.cheng@intel.com>
Cc: Matthew Brost <matthew.brost@intel.com>
Cc: Bruce Chang <yu.bruce.chang@intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Matthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230311063714.570389-2-John.C.Harrison@Intel.com


(cherry picked from commit 9724ecdb)
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 088a422c

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

+22 −0
Original line number Diff line number Diff line
@@ -1571,6 +1571,27 @@ int intel_guc_capture_print_engine_node(struct drm_i915_error_state_buf *ebuf, 


#endif //CONFIG_DRM_I915_CAPTURE_ERROR



static void guc_capture_find_ecode(struct intel_engine_coredump *ee)

{

	struct gcap_reg_list_info *reginfo;

	struct guc_mmio_reg *regs;

	i915_reg_t reg_ipehr = RING_IPEHR(0);

	i915_reg_t reg_instdone = RING_INSTDONE(0);

	int i;



	if (!ee->guc_capture_node)

		return;



	reginfo = ee->guc_capture_node->reginfo + GUC_CAPTURE_LIST_TYPE_ENGINE_INSTANCE;

	regs = reginfo->regs;

	for (i = 0; i < reginfo->num_regs; i++) {

		if (regs[i].offset == reg_ipehr.reg)

			ee->ipehr = regs[i].value;

		else if (regs[i].offset == reg_instdone.reg)

			ee->instdone.instdone = regs[i].value;

	}

}



void intel_guc_capture_free_node(struct intel_engine_coredump *ee)

{

	if (!ee || !ee->guc_capture_node)
@@ -1612,6 +1633,7 @@ void intel_guc_capture_get_matching_node(struct intel_gt *gt, 
			list_del(&n->link);

			ee->guc_capture_node = n;

			ee->guc_capture = guc->capture;

			guc_capture_find_ecode(ee);

			return;

		}

	}