Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 51889b35 authored by Paulo Zanoni's avatar Paulo Zanoni Committed by Daniel Vetter
Browse files

drm/i915: there's no DSPSIZE register on gen4+ 



So don't read it when capturing the error state. This solves some
"unclaimed register" messages on Haswell when we hang the GPU.

Signed-off-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: default avatarBen Widawsky <ben@bwidawsk.net>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent a18c4c3d

drivers/gpu/drm/i915/intel_display.c

+4 −2
Original line number Diff line number Diff line
@@ -9346,6 +9346,7 @@ intel_display_capture_error_state(struct drm_device *dev) 


		error->plane[i].control = I915_READ(DSPCNTR(i));

		error->plane[i].stride = I915_READ(DSPSTRIDE(i));

		if (INTEL_INFO(dev)->gen <= 3)

			error->plane[i].size = I915_READ(DSPSIZE(i));

		error->plane[i].pos = I915_READ(DSPPOS(i));

		error->plane[i].addr = I915_READ(DSPADDR(i));
@@ -9390,6 +9391,7 @@ intel_display_print_error_state(struct seq_file *m, 
		seq_printf(m, "Plane [%d]:\n", i);

		seq_printf(m, "  CNTR: %08x\n", error->plane[i].control);

		seq_printf(m, "  STRIDE: %08x\n", error->plane[i].stride);

		if (INTEL_INFO(dev)->gen <= 3)

			seq_printf(m, "  SIZE: %08x\n", error->plane[i].size);

		seq_printf(m, "  POS: %08x\n", error->plane[i].pos);

		seq_printf(m, "  ADDR: %08x\n", error->plane[i].addr);