On Wed, Aug 23, 2023 at 12:28:04PM -0700, Matt Roper wrote:
On Wed, Aug 23, 2023 at 10:07:18AM -0700, Lucas De Marchi wrote:
From: Clint Taylor <clinton.a.taylor@xxxxxxxxx>
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@xxxxxxxxx>
Cc: Gustavo Sousa <gustavo.sousa@xxxxxxxxx>
Signed-off-by: Clint Taylor <clinton.a.taylor@xxxxxxxxx>
Signed-off-by: Lucas De Marchi <lucas.demarchi@xxxxxxxxx>
---
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.
not sure it's very intuitive for this case though. We want to change the
behavior for display version 20, and would have to write something like
IS_DISPLAY_VER(i915, 6, 14) since the macro is inclusive on the upper
end. I'd prefer to leave with the check for 20.
Lucas De Marchi
Aside from that,
Reviewed-by: Matt Roper <matthew.d.roper@xxxxxxxxx>
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
