Commit 23dea051 authored by Lucas De Marchi's avatar Lucas De Marchi
Browse files

drm/i915/tgl: stop using ERROR_GEN6 and DONE_REG 



These registers have been removed on gen12.

v2: merge common branch for IS_GEN_RANGE(i915, 6, 11)

Signed-off-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: default avatarDaniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190730180407.5993-3-lucas.demarchi@intel.com
parent 91b59cd9

drivers/gpu/drm/i915/i915_gpu_error.c

+9 −8
Original line number Diff line number Diff line
@@ -745,16 +745,15 @@ static void __err_print_to_sgl(struct drm_i915_error_state_buf *m, 
	for (i = 0; i < error->nfence; i++)

		err_printf(m, "  fence[%d] = %08llx\n", i, error->fence[i]);



	if (INTEL_GEN(m->i915) >= 6) {

	if (IS_GEN_RANGE(m->i915, 6, 11)) {

		err_printf(m, "ERROR: 0x%08x\n", error->error);

		err_printf(m, "DONE_REG: 0x%08x\n", error->done_reg);

	}



	if (INTEL_GEN(m->i915) >= 8)

		err_printf(m, "FAULT_TLB_DATA: 0x%08x 0x%08x\n",

			   error->fault_data1, error->fault_data0);



		err_printf(m, "DONE_REG: 0x%08x\n", error->done_reg);

	}



	if (IS_GEN(m->i915, 7))

		err_printf(m, "ERR_INT: 0x%08x\n", error->err_int);
@@ -1568,9 +1567,11 @@ static void capture_reg_state(struct i915_gpu_state *error) 


	if (INTEL_GEN(i915) >= 6) {

		error->derrmr = intel_uncore_read(uncore, DERRMR);

		if (INTEL_GEN(i915) < 12) {

			error->error = intel_uncore_read(uncore, ERROR_GEN6);

			error->done_reg = intel_uncore_read(uncore, DONE_REG);

		}

	}



	if (INTEL_GEN(i915) >= 5)

		error->ccid = intel_uncore_read(uncore, CCID(RENDER_RING_BASE));

CRA Git | Maintained and supported by SUSTech CRA and CCSE