summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2010-12-08 09:30:59 +1000
committerDave Airlie <airlied@redhat.com>2010-12-08 09:30:59 +1000
commite516c7df4cfe335a2ea220480cfac558dc738ae4 (patch)
treed79fe2aadba4bcec5016084f1d26c12cac029994 /include
parent81e8d2162566379adcf4b3700f03845c62577145 (diff)
parent1b39d6f37622f1da70aa2cfd38bfff9a52c13e05 (diff)
downloadlinux-3.10-e516c7df4cfe335a2ea220480cfac558dc738ae4.tar.gz
linux-3.10-e516c7df4cfe335a2ea220480cfac558dc738ae4.tar.bz2
linux-3.10-e516c7df4cfe335a2ea220480cfac558dc738ae4.zip
Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel into drm-fixes
Diffstat (limited to 'include')
-rw-r--r--include/drm/i915_drm.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h
index 8c641bed9bb..a2776e2807a 100644
--- a/include/drm/i915_drm.h
+++ b/include/drm/i915_drm.h
@@ -287,6 +287,8 @@ typedef struct drm_i915_irq_wait {
#define I915_PARAM_HAS_EXECBUF2 9
#define I915_PARAM_HAS_BSD 10
#define I915_PARAM_HAS_BLT 11
+#define I915_PARAM_HAS_RELAXED_FENCING 12
+#define I915_PARAM_HAS_COHERENT_RINGS 13
typedef struct drm_i915_getparam {
int param;