aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Barnes2009-12-03 16:20:51 -0600
committerJesse Barnes2009-12-03 16:27:08 -0600
commit14f5958f7fd9ebe8a772ea931feb044d2d5d967b (patch)
tree7977b2e2c575242929c0156b848e6313925d182c
parent53addc5d6ef7406d9fab5ea481cf68fa011870f1 (diff)
downloadexternal-libdrm-14f5958f7fd9ebe8a772ea931feb044d2d5d967b.tar.gz
external-libdrm-14f5958f7fd9ebe8a772ea931feb044d2d5d967b.tar.xz
external-libdrm-14f5958f7fd9ebe8a772ea931feb044d2d5d967b.zip
Bump event context structure version for page flipping
-rw-r--r--xf86drm.h2
-rw-r--r--xf86drmMode.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/xf86drm.h b/xf86drm.h
index 89f1db18..9b89f562 100644
--- a/xf86drm.h
+++ b/xf86drm.h
@@ -693,7 +693,7 @@ extern void drmMsg(const char *format, ...);
693extern int drmSetMaster(int fd); 693extern int drmSetMaster(int fd);
694extern int drmDropMaster(int fd); 694extern int drmDropMaster(int fd);
695 695
696#define DRM_EVENT_CONTEXT_VERSION 1 696#define DRM_EVENT_CONTEXT_VERSION 2
697 697
698typedef struct _drmEventContext { 698typedef struct _drmEventContext {
699 699
diff --git a/xf86drmMode.c b/xf86drmMode.c
index e9516851..317aa47f 100644
--- a/xf86drmMode.c
+++ b/xf86drmMode.c
@@ -701,7 +701,7 @@ int drmHandleEvent(int fd, drmEventContextPtr evctx)
701 U642VOID (vblank->user_data)); 701 U642VOID (vblank->user_data));
702 break; 702 break;
703 case DRM_EVENT_FLIP_COMPLETE: 703 case DRM_EVENT_FLIP_COMPLETE:
704 if (evctx->version < 1 || 704 if (evctx->version < 2 ||
705 evctx->page_flip_handler == NULL) 705 evctx->page_flip_handler == NULL)
706 break; 706 break;
707 vblank = (struct drm_event_vblank *) e; 707 vblank = (struct drm_event_vblank *) e;