diff options
| author | Keith Packard <keithp@keithp.com> | 2016-07-18 21:24:23 -0700 |
|---|---|---|
| committer | Michel Dänzer <michel@daenzer.net> | 2016-07-20 10:26:23 +0900 |
| commit | 024afff27eb9f4c60043214099ddb42bbfb3d289 (patch) | |
| tree | 7fa297f613b3fe41979ce1020039f4312770acad | |
| parent | eac4db4f0cb22a23d6e69161dcaacc7d53978aae (diff) | |
Adapt to video API 22
Deal with drm fd wakeup
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-and-Tested-by: Michel Dänzer <michel.daenzer@amd.com>
| -rw-r--r-- | src/drmmode_display.c | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/src/drmmode_display.c b/src/drmmode_display.c index 25554657..b1de9520 100644 --- a/src/drmmode_display.c +++ b/src/drmmode_display.c @@ -59,6 +59,10 @@ #define DEFAULT_NOMINAL_FRAME_RATE 60 +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) >= 22 +#define HAVE_NOTIFY_FD 1 +#endif + static Bool drmmode_xf86crtc_resize (ScrnInfoPtr scrn, int width, int height); @@ -2231,13 +2235,21 @@ drmmode_flip_handler(xf86CrtcPtr crtc, uint32_t frame, uint64_t usec, void *even } +#if HAVE_NOTIFY_FD +static void +drm_notify_fd(int fd, int ready, void *data) +#else static void drm_wakeup_handler(pointer data, int err, pointer p) +#endif { drmmode_ptr drmmode = data; +#if !HAVE_NOTIFY_FD fd_set *read_mask = p; - if (err >= 0 && FD_ISSET(drmmode->fd, read_mask)) { + if (err >= 0 && FD_ISSET(drmmode->fd, read_mask)) +#endif + { drmHandleEvent(drmmode->fd, &drmmode->event_context); } } @@ -2321,9 +2333,13 @@ void drmmode_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode) info->drmmode_inited = TRUE; if (pRADEONEnt->fd_wakeup_registered != serverGeneration) { +#if HAVE_NOTIFY_FD + SetNotifyFd(drmmode->fd, drm_notify_fd, X_NOTIFY_READ, drmmode); +#else AddGeneralSocket(drmmode->fd); RegisterBlockAndWakeupHandlers((BlockHandlerProcPtr)NoopDDA, drm_wakeup_handler, drmmode); +#endif pRADEONEnt->fd_wakeup_registered = serverGeneration; pRADEONEnt->fd_wakeup_ref = 1; } else @@ -2340,9 +2356,13 @@ void drmmode_fini(ScrnInfoPtr pScrn, drmmode_ptr drmmode) if (pRADEONEnt->fd_wakeup_registered == serverGeneration && !--pRADEONEnt->fd_wakeup_ref) { +#if HAVE_NOTIFY_FD + RemoveNotifyFd(drmmode->fd); +#else RemoveGeneralSocket(drmmode->fd); RemoveBlockAndWakeupHandlers((BlockHandlerProcPtr)NoopDDA, drm_wakeup_handler, drmmode); +#endif } } |