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 /xf86drm.h
parentdb50f5127421ac8f4e3ce4eb7c27d27475781488 (diff)
parentee746a83cecd99d4c380fbc5d391399a6d9fde9e (diff)
downloadexternal-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 'xf86drm.h')
-rw-r--r--xf86drm.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/xf86drm.h b/xf86drm.h
index 496d95d8..89f1db18 100644
--- a/xf86drm.h
+++ b/xf86drm.h
@@ -707,6 +707,12 @@ typedef struct _drmEventContext {
707 unsigned int tv_usec, 707 unsigned int tv_usec,
708 void *user_data); 708 void *user_data);
709 709
710 void (*page_flip_handler)(int fd,
711 unsigned int sequence,
712 unsigned int tv_sec,
713 unsigned int tv_usec,
714 void *user_data);
715
710} drmEventContext, *drmEventContextPtr; 716} drmEventContext, *drmEventContextPtr;
711 717
712extern int drmHandleEvent(int fd, drmEventContextPtr evctx); 718extern int drmHandleEvent(int fd, drmEventContextPtr evctx);