diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-01-05 11:19:34 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-01-05 11:19:34 +0100 |
| commit | 4b5a5096bb834102b2e821f5f34274f041862d67 (patch) | |
| tree | fe55f4f11111e34d503a6a01aeb4bfc2eae5e88a /drivers/gpu/drm/i915/i915_reg.h | |
| parent | 19570d747795f0ecff79403698b868dc5ad7fa86 (diff) | |
| parent | 150116bcfbd9004f01e682535baddaca2b90d3b2 (diff) | |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'drivers/gpu/drm/i915/i915_reg.h')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_reg.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index f9eafb6ed523..ee2742122a02 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h @@ -235,6 +235,7 @@ */ #define MI_LOAD_REGISTER_IMM(x) MI_INSTR(0x22, 2*x-1) #define MI_STORE_REGISTER_MEM(x) MI_INSTR(0x24, 2*x-1) +#define MI_SRM_LRM_GLOBAL_GTT (1<<22) #define MI_FLUSH_DW MI_INSTR(0x26, 1) /* for GEN6 */ #define MI_FLUSH_DW_STORE_INDEX (1<<21) #define MI_INVALIDATE_TLB (1<<18) |