diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-12-07 18:30:59 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-12-07 18:30:59 -0500 |
| commit | e516c7df4cfe335a2ea220480cfac558dc738ae4 (patch) | |
| tree | d79fe2aadba4bcec5016084f1d26c12cac029994 /include | |
| parent | 81e8d2162566379adcf4b3700f03845c62577145 (diff) | |
| parent | 1b39d6f37622f1da70aa2cfd38bfff9a52c13e05 (diff) | |
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 { | |||
| 287 | #define I915_PARAM_HAS_EXECBUF2 9 | 287 | #define I915_PARAM_HAS_EXECBUF2 9 |
| 288 | #define I915_PARAM_HAS_BSD 10 | 288 | #define I915_PARAM_HAS_BSD 10 |
| 289 | #define I915_PARAM_HAS_BLT 11 | 289 | #define I915_PARAM_HAS_BLT 11 |
| 290 | #define I915_PARAM_HAS_RELAXED_FENCING 12 | ||
| 291 | #define I915_PARAM_HAS_COHERENT_RINGS 13 | ||
| 290 | 292 | ||
| 291 | typedef struct drm_i915_getparam { | 293 | typedef struct drm_i915_getparam { |
| 292 | int param; | 294 | int param; |