diff options
author | Eric Anholt <eric@anholt.net> | 2007-08-16 09:23:09 -0700 |
---|---|---|
committer | Eric Anholt <eric@anholt.net> | 2007-08-16 09:23:09 -0700 |
commit | 0055fd5c35306a6363b0414f7f2220b3d1c27ecc (patch) | |
tree | 40178e87d98efeb4bd9e0030b989a31e2090b9c9 /shared-core/i915_drv.h | |
parent | 3a0bc518e35c62bb9c64c9105f836584d949653f (diff) | |
parent | 02c4e0e757b69cd6ae38b8ab2c078b3f06fea661 (diff) |
Merge branch 'master' into bo-set-pin
Diffstat (limited to 'shared-core/i915_drv.h')
-rw-r--r-- | shared-core/i915_drv.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/shared-core/i915_drv.h b/shared-core/i915_drv.h index e641fdc6..528f7b3a 100644 --- a/shared-core/i915_drv.h +++ b/shared-core/i915_drv.h @@ -364,6 +364,8 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller); #define MI_BATCH_BUFFER_END (0xA<<23) #define MI_BATCH_NON_SECURE (1) +#define MI_BATCH_NON_SECURE_I965 (1<<8) + #define MI_WAIT_FOR_EVENT ((0x3<<23)) #define MI_WAIT_FOR_PLANE_B_FLIP (1<<6) #define MI_WAIT_FOR_PLANE_A_FLIP (1<<2) |