diff options
| author | Dave Airlie <airlied@redhat.com> | 2013-08-23 12:52:37 +0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-08-23 12:52:37 +0400 |
| commit | 4dd17ee95742f3e9fd55d07463981711a637bd20 (patch) | |
| tree | 38e7748d84ec850cf66e9cf1f42fa9905e13ca8c /drivers/gpu/drm/i915/i915_reg.h | |
| parent | 6f1e120438144a47463b80c3e113334a6bd0e77c (diff) | |
| parent | 884020bf3d2a3787a1cc6df902e98e0eec60330b (diff) | |
| download | linux-4dd17ee95742f3e9fd55d07463981711a637bd20.tar.xz | |
Merge tag 'drm-intel-fixes-2013-08-23' of git://people.freedesktop.org/~danvet/drm-intel into drm-fixes
Just one patch that soaked for quite a bit to fix a resume issue,
resulting in gpu hangs (or worse) due to tlb containing garbage.
* tag 'drm-intel-fixes-2013-08-23' of git://people.freedesktop.org/~danvet/drm-intel:
drm/i915: Invalidate TLBs for the rings after a reset
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 6f514297c483..53cddd985406 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h @@ -752,6 +752,8 @@ will not assert AGPBUSY# and will only be delivered when out of C3. */ #define INSTPM_FORCE_ORDERING (1<<7) /* GEN6+ */ +#define INSTPM_TLB_INVALIDATE (1<<9) +#define INSTPM_SYNC_FLUSH (1<<5) #define ACTHD 0x020c8 #define FW_BLC 0x020d8 #define FW_BLC2 0x020dc |