aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Barnes2009-12-03 16:17:26 -0600
committerJesse Barnes2009-12-03 16:17:26 -0600
commit53addc5d6ef7406d9fab5ea481cf68fa011870f1 (patch)
treeeb43991923600b5751e04539438e5fffebb61cb3 /include/drm/i915_drm.h
parentdb50f5127421ac8f4e3ce4eb7c27d27475781488 (diff)
parentee746a83cecd99d4c380fbc5d391399a6d9fde9e (diff)
downloadexternal-libgbm-53addc5d6ef7406d9fab5ea481cf68fa011870f1.tar.gz
external-libgbm-53addc5d6ef7406d9fab5ea481cf68fa011870f1.tar.xz
external-libgbm-53addc5d6ef7406d9fab5ea481cf68fa011870f1.zip
Merge branch 'pageflip' of git://people.freedesktop.org/~jbarnes/drm
Conflicts: include/drm/drm.h - RMFB had its signature changed to avoid uint32_t
Diffstat (limited to 'include/drm/i915_drm.h')
-rw-r--r--include/drm/i915_drm.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h
index 25ff7b79..75b0e1d5 100644
--- a/include/drm/i915_drm.h
+++ b/include/drm/i915_drm.h
@@ -271,6 +271,7 @@ typedef struct drm_i915_irq_wait {
271#define I915_PARAM_HAS_GEM 5 271#define I915_PARAM_HAS_GEM 5
272#define I915_PARAM_NUM_FENCES_AVAIL 6 272#define I915_PARAM_NUM_FENCES_AVAIL 6
273#define I915_PARAM_HAS_OVERLAY 7 273#define I915_PARAM_HAS_OVERLAY 7
274#define I915_PARAM_HAS_PAGEFLIPPING 8
274 275
275typedef struct drm_i915_getparam { 276typedef struct drm_i915_getparam {
276 int param; 277 int param;