[Intel-gfx] [Intel-xe] [PATCH 20/42] drm/i915/xe2lpd: Register DE_RRMR has been removed

[Matt Roper]

On Wed, Aug 23, 2023 at 10:07:18AM -0700, Lucas De Marchi wrote:
> From: Clint Taylor <clinton.a.taylor at intel.com>
> 
> Do not read DE_RRMR register after display version 20. This register
> contains display state information during GFX state dumps.
> 
> Bspec: 69456
> Cc: Anusha Srivatsa <anusha.srivatsa at intel.com>
> Cc: Gustavo Sousa <gustavo.sousa at intel.com>
> Signed-off-by: Clint Taylor <clinton.a.taylor at intel.com>
> Signed-off-by: Lucas De Marchi <lucas.demarchi at intel.com>
> ---
>  drivers/gpu/drm/i915/i915_gpu_error.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
> index 4749f99e6320..fe2fa6f966f2 100644
> --- a/drivers/gpu/drm/i915/i915_gpu_error.c
> +++ b/drivers/gpu/drm/i915/i915_gpu_error.c
> @@ -1755,7 +1755,7 @@ static void gt_record_display_regs(struct intel_gt_coredump *gt)
>  	struct intel_uncore *uncore = gt->_gt->uncore;
>  	struct drm_i915_private *i915 = uncore->i915;
>  
> -	if (GRAPHICS_VER(i915) >= 6)
> +	if (DISPLAY_VER(i915) >= 6 && DISPLAY_VER(i915) < 20)

We have IS_DISPLAY_VER() that's slightly simpler for ranges like this.

Aside from that,

        Reviewed-by: Matt Roper <matthew.d.roper at intel.com>


Matt

>  		gt->derrmr = intel_uncore_read(uncore, DERRMR);
>  
>  	if (GRAPHICS_VER(i915) >= 8)
> -- 
> 2.40.1
> 

-- 
Matt Roper
Graphics Software Engineer
Linux GPU Platform Enablement
Intel Corporation