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

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

drm/i915: capture the correct cursor registers on IVB 



This solves some "unclaimed register" messages when there's a GPU hang
on Haswell.

Signed-off-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: default avatarBen Widawsky <ben@bwidawsk.net>
[danvet: Add missing IS_VLV check as spotted by Ville Syrjälä.]
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 2831d842

drivers/gpu/drm/i915/intel_display.c

+9 −3
Original line number Diff line number Diff line
@@ -9334,9 +9334,15 @@ intel_display_capture_error_state(struct drm_device *dev) 
	for_each_pipe(i) {

		cpu_transcoder = intel_pipe_to_cpu_transcoder(dev_priv, i);



		if (INTEL_INFO(dev)->gen <= 6 || IS_VALLEYVIEW(dev)) {

			error->cursor[i].control = I915_READ(CURCNTR(i));

			error->cursor[i].position = I915_READ(CURPOS(i));

			error->cursor[i].base = I915_READ(CURBASE(i));

		} else {

			error->cursor[i].control = I915_READ(CURCNTR_IVB(i));

			error->cursor[i].position = I915_READ(CURPOS_IVB(i));

			error->cursor[i].base = I915_READ(CURBASE_IVB(i));

		}



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

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