diff options
| author | Jesse Barnes | 2009-12-03 16:17:26 -0600 |
|---|---|---|
| committer | Jesse Barnes | 2009-12-03 16:17:26 -0600 |
| commit | 53addc5d6ef7406d9fab5ea481cf68fa011870f1 (patch) | |
| tree | eb43991923600b5751e04539438e5fffebb61cb3 /xf86drmMode.h | |
| parent | db50f5127421ac8f4e3ce4eb7c27d27475781488 (diff) | |
| parent | ee746a83cecd99d4c380fbc5d391399a6d9fde9e (diff) | |
| download | external-libdrm-53addc5d6ef7406d9fab5ea481cf68fa011870f1.tar.gz external-libdrm-53addc5d6ef7406d9fab5ea481cf68fa011870f1.tar.xz external-libdrm-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 'xf86drmMode.h')
| -rw-r--r-- | xf86drmMode.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/xf86drmMode.h b/xf86drmMode.h index 62304bb9..705369fe 100644 --- a/xf86drmMode.h +++ b/xf86drmMode.h | |||
| @@ -362,3 +362,5 @@ extern int drmModeCrtcSetGamma(int fd, uint32_t crtc_id, uint32_t size, | |||
| 362 | uint16_t *red, uint16_t *green, uint16_t *blue); | 362 | uint16_t *red, uint16_t *green, uint16_t *blue); |
| 363 | extern int drmModeCrtcGetGamma(int fd, uint32_t crtc_id, uint32_t size, | 363 | extern int drmModeCrtcGetGamma(int fd, uint32_t crtc_id, uint32_t size, |
| 364 | uint16_t *red, uint16_t *green, uint16_t *blue); | 364 | uint16_t *red, uint16_t *green, uint16_t *blue); |
| 365 | extern int drmModePageFlip(int fd, uint32_t crtc_id, uint32_t fb_id, | ||
| 366 | uint32_t flags, void *user_data); | ||