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.c | |
parent | db50f5127421ac8f4e3ce4eb7c27d27475781488 (diff) | |
parent | ee746a83cecd99d4c380fbc5d391399a6d9fde9e (diff) | |
download | libdrm-53addc5d6ef7406d9fab5ea481cf68fa011870f1.tar.gz libdrm-53addc5d6ef7406d9fab5ea481cf68fa011870f1.tar.xz 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.c')
-rw-r--r-- | xf86drmMode.c | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/xf86drmMode.c b/xf86drmMode.c index 6d85113a..e9516851 100644 --- a/xf86drmMode.c +++ b/xf86drmMode.c | |||
@@ -700,7 +700,17 @@ int drmHandleEvent(int fd, drmEventContextPtr evctx) | |||
700 | vblank->tv_usec, | 700 | vblank->tv_usec, |
701 | U642VOID (vblank->user_data)); | 701 | U642VOID (vblank->user_data)); |
702 | break; | 702 | break; |
703 | 703 | case DRM_EVENT_FLIP_COMPLETE: | |
704 | if (evctx->version < 1 || | ||
705 | evctx->page_flip_handler == NULL) | ||
706 | break; | ||
707 | vblank = (struct drm_event_vblank *) e; | ||
708 | evctx->page_flip_handler(fd, | ||
709 | vblank->sequence, | ||
710 | vblank->tv_sec, | ||
711 | vblank->tv_usec, | ||
712 | U642VOID (vblank->user_data)); | ||
713 | break; | ||
704 | default: | 714 | default: |
705 | break; | 715 | break; |
706 | } | 716 | } |
@@ -710,3 +720,16 @@ int drmHandleEvent(int fd, drmEventContextPtr evctx) | |||
710 | return 0; | 720 | return 0; |
711 | } | 721 | } |
712 | 722 | ||
723 | int drmModePageFlip(int fd, uint32_t crtc_id, uint32_t fb_id, | ||
724 | uint32_t flags, void *user_data) | ||
725 | { | ||
726 | struct drm_mode_crtc_page_flip flip; | ||
727 | |||
728 | flip.fb_id = fb_id; | ||
729 | flip.crtc_id = crtc_id; | ||
730 | flip.user_data = VOID2U64(user_data); | ||
731 | flip.flags = flags; | ||
732 | flip.reserved = 0; | ||
733 | |||
734 | return drmIoctl(fd, DRM_IOCTL_MODE_PAGE_FLIP, &flip); | ||
735 | } | ||