diff options
| author | Jesse Barnes <jbarnes@virtuousgeek.org> | 2009-12-03 14:17:26 -0800 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2009-12-03 14:17:26 -0800 |
| commit | 53addc5d6ef7406d9fab5ea481cf68fa011870f1 (patch) | |
| tree | eb43991923600b5751e04539438e5fffebb61cb3 /include | |
| parent | db50f5127421ac8f4e3ce4eb7c27d27475781488 (diff) | |
| parent | ee746a83cecd99d4c380fbc5d391399a6d9fde9e (diff) | |
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.h | 4 | ||||
| -rw-r--r-- | include/drm/drm_mode.h | 11 | ||||
| -rw-r--r-- | include/drm/i915_drm.h | 1 |
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 { #define DRM_IOCTL_MODE_GETFB DRM_IOWR(0xAD, struct drm_mode_fb_cmd) #define DRM_IOCTL_MODE_ADDFB DRM_IOWR(0xAE, struct drm_mode_fb_cmd) #define DRM_IOCTL_MODE_RMFB DRM_IOWR(0xAF, unsigned int) +#define DRM_IOCTL_MODE_PAGE_FLIP DRM_IOWR(0xB0, struct drm_mode_crtc_page_flip) + +/*@}*/ /** * Device specific ioctls should only be in their respective headers @@ -726,6 +729,7 @@ struct drm_event { }; #define DRM_EVENT_VBLANK 0x01 +#define DRM_EVENT_FLIP_COMPLETE 0x02 struct drm_event_vblank { 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 { __u64 blue; }; +#define DRM_MODE_PAGE_FLIP_EVENT 0x01 +#define DRM_MODE_PAGE_FLIP_FLAGS DRM_MODE_PAGE_FLIP_EVENT + +struct drm_mode_crtc_page_flip { + uint32_t crtc_id; + uint32_t fb_id; + uint32_t flags; + uint32_t reserved; + uint64_t user_data; +}; + #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 { #define I915_PARAM_HAS_GEM 5 #define I915_PARAM_NUM_FENCES_AVAIL 6 #define I915_PARAM_HAS_OVERLAY 7 +#define I915_PARAM_HAS_PAGEFLIPPING 8 typedef struct drm_i915_getparam { int param; |