diff options
| author | Naresh Kumar Kachhi | 2014-03-12 12:09:41 +0100 |
|---|---|---|
| committer | Daniel Vetter | 2014-03-12 16:04:19 +0100 |
| commit | e9fea5747d2b3dbff47a8790c1cc4d7af80051d6 (patch) | |
| tree | d6292f9a6b121589682365bfc24c5dcd368f7f05 /drivers/gpu/drm/i915/intel_ringbuffer.h | |
| parent | drm/i915: disable rings before HW status page setup (diff) | |
| download | kernel-qcow2-linux-e9fea5747d2b3dbff47a8790c1cc4d7af80051d6.tar.gz kernel-qcow2-linux-e9fea5747d2b3dbff47a8790c1cc4d7af80051d6.tar.xz kernel-qcow2-linux-e9fea5747d2b3dbff47a8790c1cc4d7af80051d6.zip | |
drm/i915: wait for rings to become idle once disabled
make sure we wait for rings to become idle once they are
disabled. In case of timeout print an error message
Signed-off-by: Naresh Kumar Kachhi <naresh.kumar.kachhi@intel.com>
[danvet: Frob patch as suggested by Chris.]
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_ringbuffer.h')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_ringbuffer.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.h b/drivers/gpu/drm/i915/intel_ringbuffer.h index 09af92099c1b..f11ceb230db4 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.h +++ b/drivers/gpu/drm/i915/intel_ringbuffer.h @@ -33,6 +33,8 @@ struct intel_hw_status_page { #define I915_READ_IMR(ring) I915_READ(RING_IMR((ring)->mmio_base)) #define I915_WRITE_IMR(ring, val) I915_WRITE(RING_IMR((ring)->mmio_base), val) +#define I915_READ_MODE(ring) I915_READ(RING_MI_MODE((ring)->mmio_base)) + enum intel_ring_hangcheck_action { HANGCHECK_IDLE = 0, HANGCHECK_WAIT, |