diff options
| author | Eric Anholt | 2010-11-18 02:31:14 +0100 |
|---|---|---|
| committer | Chris Wilson | 2010-11-22 10:02:07 +0100 |
| commit | cff458c21063de960bde0e39770a0f4cd0477d95 (patch) | |
| tree | 0426913408f5d5e4e30febe0bbab6f05f86987ae /drivers/gpu/drm/i915/i915_reg.h | |
| parent | drm/i915: Also reinit the BSD and BLT rings after a GPU reset. (diff) | |
| download | kernel-qcow2-linux-cff458c21063de960bde0e39770a0f4cd0477d95.tar.gz kernel-qcow2-linux-cff458c21063de960bde0e39770a0f4cd0477d95.tar.xz kernel-qcow2-linux-cff458c21063de960bde0e39770a0f4cd0477d95.zip | |
drm/i915: Add support for GPU reset on gen6.
This has proven sufficient to recover from a hang of the GPU using the
gem_bad_blit test while at the KMS console then starting X. When
attempting the same during an X session, the timer doesn't appear to
trigger.
Signed-off-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_reg.h')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_reg.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index ec2a8b07ba5b..c668b2fb7e3d 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h @@ -78,6 +78,12 @@ #define GRDOM_RENDER (1<<2) #define GRDOM_MEDIA (3<<2) +#define GEN6_GDRST 0x941c +#define GEN6_GRDOM_FULL (1 << 0) +#define GEN6_GRDOM_RENDER (1 << 1) +#define GEN6_GRDOM_MEDIA (1 << 2) +#define GEN6_GRDOM_BLT (1 << 3) + /* VGA stuff */ #define VGA_ST01_MDA 0x3ba |