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/i915_reg.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/i915_reg.h')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_reg.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index 146609ab42bb..6174fda4d58e 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h @@ -748,6 +748,7 @@ enum punit_power_well { #define RING_INSTPS(base) ((base)+0x70) #define RING_DMA_FADD(base) ((base)+0x78) #define RING_INSTPM(base) ((base)+0xc0) +#define RING_MI_MODE(base) ((base)+0x9c) #define INSTPS 0x02070 /* 965+ only */ #define INSTDONE1 0x0207c /* 965+ only */ #define ACTHD_I965 0x02074 @@ -824,6 +825,7 @@ enum punit_power_well { # define VS_TIMER_DISPATCH (1 << 6) # define MI_FLUSH_ENABLE (1 << 12) # define ASYNC_FLIP_PERF_DISABLE (1 << 14) +# define MODE_IDLE (1 << 9) #define GEN6_GT_MODE 0x20d0 #define GEN7_GT_MODE 0x7008 |