From 16a07ae2eb1aedbabf1d96f83714f10cdfe88644 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Tue, 5 Aug 2025 13:53:21 +0200 Subject: [PATCH] drop HAVE_NOTIFY_FD It's always set, so no need to ifdef on it. Signed-off-by: Enrico Weigelt, metux IT consult --- src/compat-api.h | 2 -- src/drmmode_display.c | 25 ------------------------- 2 files changed, 27 deletions(-) diff --git a/src/compat-api.h b/src/compat-api.h index 76b95ed..081aba0 100644 --- a/src/compat-api.h +++ b/src/compat-api.h @@ -26,8 +26,6 @@ #ifndef COMPAT_API_H #define COMPAT_API_H -#define HAVE_NOTIFY_FD 1 - #define BLOCKHANDLER_ARGS_DECL ScreenPtr pScreen, void* pTimeout #define BLOCKHANDLER_ARGS pScreen, pTimeout diff --git a/src/drmmode_display.c b/src/drmmode_display.c index 38bf1c7..fdf5559 100644 --- a/src/drmmode_display.c +++ b/src/drmmode_display.c @@ -3066,24 +3066,11 @@ drmmode_flip_handler(xf86CrtcPtr crtc, uint32_t frame, uint64_t usec, void *even } } -#if HAVE_NOTIFY_FD static void drmmode_notify_fd(int fd, int notify, void *data) { drmmode_ptr drmmode = data; amdgpu_drm_handle_event(fd, &drmmode->event_context); } -#else -static void drm_wakeup_handler(void* data, int err, void* p) -{ - drmmode_ptr drmmode = data; - AMDGPUEntPtr pAMDGPUEnt = AMDGPUEntPriv(drmmode->scrn); - fd_set *read_mask = p; - - if (err >= 0 && FD_ISSET(pAMDGPUEnt->fd, read_mask)) { - amdgpu_drm_handle_event(pAMDGPUEnt->fd, &drmmode->event_context); - } -} -#endif static Bool drmmode_probe_page_flip_target(AMDGPUEntPtr pAMDGPUEnt) { @@ -3315,13 +3302,7 @@ void drmmode_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode) info->drmmode_inited = TRUE; if (pAMDGPUEnt->fd_wakeup_registered != serverGeneration) { -#if HAVE_NOTIFY_FD SetNotifyFd(pAMDGPUEnt->fd, drmmode_notify_fd, X_NOTIFY_READ, drmmode); -#else - AddGeneralSocket(pAMDGPUEnt->fd); - RegisterBlockAndWakeupHandlers((BlockHandlerProcPtr) NoopDDA, - drm_wakeup_handler, drmmode); -#endif pAMDGPUEnt->fd_wakeup_registered = serverGeneration; pAMDGPUEnt->fd_wakeup_ref = 1; } else @@ -3343,13 +3324,7 @@ void drmmode_fini(ScrnInfoPtr pScrn, drmmode_ptr drmmode) if (pAMDGPUEnt->fd_wakeup_registered == serverGeneration && !--pAMDGPUEnt->fd_wakeup_ref) { -#if HAVE_NOTIFY_FD RemoveNotifyFd(pAMDGPUEnt->fd); -#else - RemoveGeneralSocket(pAMDGPUEnt->fd); - RemoveBlockAndWakeupHandlers((BlockHandlerProcPtr) NoopDDA, - drm_wakeup_handler, drmmode); -#endif } }