diff options
| author | Paulo Zanoni | 2013-03-07 00:03:12 +0100 |
|---|---|---|
| committer | Daniel Vetter | 2013-03-17 21:26:04 +0100 |
| commit | a18c4c3d8fd5c0abe955b85a41f50798f321618f (patch) | |
| tree | f35711d91d8258ef830601176877e860bed2dd84 /drivers/gpu/drm/i915/intel_display.c | |
| parent | drm/i915: disable sound first on intel_disable_ddi (diff) | |
| download | kernel-qcow2-linux-a18c4c3d8fd5c0abe955b85a41f50798f321618f.tar.gz kernel-qcow2-linux-a18c4c3d8fd5c0abe955b85a41f50798f321618f.tar.xz kernel-qcow2-linux-a18c4c3d8fd5c0abe955b85a41f50798f321618f.zip | |
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: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: Ben Widawsky <ben@bwidawsk.net>
[danvet: Add missing IS_VLV check as spotted by Ville Syrjälä.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 502cb28a46c9..1dc6c18f3970 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -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); - error->cursor[i].control = I915_READ(CURCNTR(i)); - error->cursor[i].position = I915_READ(CURPOS(i)); - error->cursor[i].base = I915_READ(CURBASE(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)); |