diff options
| author | Dave Airlie | 2010-12-08 00:30:59 +0100 |
|---|---|---|
| committer | Dave Airlie | 2010-12-08 00:30:59 +0100 |
| commit | e516c7df4cfe335a2ea220480cfac558dc738ae4 (patch) | |
| tree | d79fe2aadba4bcec5016084f1d26c12cac029994 /include | |
| parent | Merge branch 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
| parent | drm/i915/dp: Only apply the workaround if the select is still active (diff) | |
| download | kernel-qcow2-linux-e516c7df4cfe335a2ea220480cfac558dc738ae4.tar.gz kernel-qcow2-linux-e516c7df4cfe335a2ea220480cfac558dc738ae4.tar.xz kernel-qcow2-linux-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.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h index 8c641bed9bbd..a2776e2807a4 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; |