[Intel-gfx] [PATCH v2 2/5] drm/i915/tgl: stop using ERROR_GEN6 and DONE_REG

[Daniele Ceraolo Spurio]

On 7/29/19 2:19 PM, Lucas De Marchi wrote:
> These registers have been removed on gen12.
> 
> Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio at intel.com>
> Signed-off-by: Lucas De Marchi <lucas.demarchi at intel.com>
> ---
>   drivers/gpu/drm/i915/i915_gpu_error.c | 16 +++++++++-------
>   1 file changed, 9 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
> index 673c5dc93d28..974be35161d4 100644
> --- a/drivers/gpu/drm/i915/i915_gpu_error.c
> +++ b/drivers/gpu/drm/i915/i915_gpu_error.c
> @@ -745,15 +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);
>   
> -		if (INTEL_GEN(m->i915) >= 8)
> -			err_printf(m, "FAULT_TLB_DATA: 0x%08x 0x%08x\n",
> -				   error->fault_data1, error->fault_data0);
> +	if (INTEL_GEN(m->i915) >= 8)
> +		err_printf(m, "FAULT_TLB_DATA: 0x%08x 0x%08x\n",
> +			   error->fault_data1, error->fault_data0);
>   
> +	if (IS_GEN_RANGE(m->i915, 6, 11))
>   		err_printf(m, "DONE_REG: 0x%08x\n", error->done_reg);

Could move this in the if above where we print ERROR, but anyway:

Reviewed-by: Daniele Ceraolo Spurio <daniele.ceraolospurio at intel.com>

Daniele

> -	}
>   
>   	if (IS_GEN(m->i915, 7))
>   		err_printf(m, "ERR_INT: 0x%08x\n", error->err_int);
> @@ -1569,8 +1569,10 @@ static void capture_reg_state(struct i915_gpu_state *error)
>   
>   	if (INTEL_GEN(i915) >= 6) {
>   		error->derrmr = intel_uncore_read(uncore, DERRMR);
> -		error->error = intel_uncore_read(uncore, ERROR_GEN6);
> -		error->done_reg = intel_uncore_read(uncore, DONE_REG);
> +		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)
>