From: Jani Nikula Date: Mon, 14 Apr 2025 11:29:47 +0000 (+0300) Subject: drm/i915: don't capture DERRMR for VLV/CHV X-Git-Tag: v6.16-rc1~144^2~12^2~93 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=02cfe5a3bcb8768677a68e86016a5c7e138cd7ce;p=thirdparty%2Flinux.git drm/i915: don't capture DERRMR for VLV/CHV DERRMR isn't valid for VLV/CHV. Don't capture it for them. Suggested-by: Ville Syrjälä Reviewed-by: Ville Syrjälä Link: https://lore.kernel.org/r/4563cc7eb567ac508b84717c3708a4e48aa8b7bb.1744630147.git.jani.nikula@intel.com Signed-off-by: Jani Nikula --- diff --git a/drivers/gpu/drm/i915/display/intel_display_irq.c b/drivers/gpu/drm/i915/display/intel_display_irq.c index f5dc050a63441..5d07b6a9e59e3 100644 --- a/drivers/gpu/drm/i915/display/intel_display_irq.c +++ b/drivers/gpu/drm/i915/display/intel_display_irq.c @@ -2343,7 +2343,7 @@ intel_display_irq_snapshot_capture(struct intel_display *display) if (!snapshot) return NULL; - if (DISPLAY_VER(display) >= 6 && DISPLAY_VER(display) < 20) + if (DISPLAY_VER(display) >= 6 && DISPLAY_VER(display) < 20 && !HAS_GMCH(display)) snapshot->derrmr = intel_de_read(display, DERRMR); return snapshot;