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
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')
-rw-r--r--include/drm/drm.h4
-rw-r--r--include/drm/drm_mode.h11
-rw-r--r--include/drm/i915_drm.h1
3 files changed, 16 insertions, 0 deletions
diff --git a/include/drm/drm.h b/include/drm/drm.h
index 649c46f3..5408c08c 100644
--- a/include/drm/drm.h
+++ b/include/drm/drm.h
@@ -696,6 +696,9 @@ struct drm_gem_open {
696#define DRM_IOCTL_MODE_GETFB DRM_IOWR(0xAD, struct drm_mode_fb_cmd) 696#define DRM_IOCTL_MODE_GETFB DRM_IOWR(0xAD, struct drm_mode_fb_cmd)
697#define DRM_IOCTL_MODE_ADDFB DRM_IOWR(0xAE, struct drm_mode_fb_cmd) 697#define DRM_IOCTL_MODE_ADDFB DRM_IOWR(0xAE, struct drm_mode_fb_cmd)
698#define DRM_IOCTL_MODE_RMFB DRM_IOWR(0xAF, unsigned int) 698#define DRM_IOCTL_MODE_RMFB DRM_IOWR(0xAF, unsigned int)
699#define DRM_IOCTL_MODE_PAGE_FLIP DRM_IOWR(0xB0, struct drm_mode_crtc_page_flip)
700
701/*@}*/
699 702
700/** 703/**
701 * Device specific ioctls should only be in their respective headers 704 * Device specific ioctls should only be in their respective headers
@@ -726,6 +729,7 @@ struct drm_event {
726}; 729};
727 730
728#define DRM_EVENT_VBLANK 0x01 731#define DRM_EVENT_VBLANK 0x01
732#define DRM_EVENT_FLIP_COMPLETE 0x02
729 733
730struct drm_event_vblank { 734struct drm_event_vblank {
731 struct drm_event base; 735 struct drm_event base;
diff --git a/include/drm/drm_mode.h b/include/drm/drm_mode.h
index 852505e7..1fd30266 100644
--- a/include/drm/drm_mode.h
+++ b/include/drm/drm_mode.h
@@ -265,4 +265,15 @@ struct drm_mode_crtc_lut {
265 __u64 blue; 265 __u64 blue;
266}; 266};
267 267
268#define DRM_MODE_PAGE_FLIP_EVENT 0x01
269#define DRM_MODE_PAGE_FLIP_FLAGS DRM_MODE_PAGE_FLIP_EVENT
270
271struct drm_mode_crtc_page_flip {
272 uint32_t crtc_id;
273 uint32_t fb_id;
274 uint32_t flags;
275 uint32_t reserved;
276 uint64_t user_data;
277};
278
268#endif 279#endif
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;