From 21e8a4a1b993a9b1abd4a7510cd3d8a152be998b Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Wed, 7 Mar 2018 18:45:33 +0000 Subject: [PATCH] modesetting: remove fallback DRM_CAP_* defines All the macros are available in the libdrm that we depend on. Signed-off-by: Emil Velikov Reviewed-by: Adam Jackson --- hw/xfree86/drivers/modesetting/driver.c | 8 -------- hw/xfree86/drivers/modesetting/drmmode_display.h | 7 ------- 2 files changed, 15 deletions(-) diff --git a/hw/xfree86/drivers/modesetting/driver.c b/hw/xfree86/drivers/modesetting/driver.c index f92fa01ab..363e2e19d 100644 --- a/hw/xfree86/drivers/modesetting/driver.c +++ b/hw/xfree86/drivers/modesetting/driver.c @@ -798,14 +798,6 @@ msShouldDoubleShadow(ScrnInfoPtr pScrn, modesettingPtr ms) return ret; } -#ifndef DRM_CAP_CURSOR_WIDTH -#define DRM_CAP_CURSOR_WIDTH 0x8 -#endif - -#ifndef DRM_CAP_CURSOR_HEIGHT -#define DRM_CAP_CURSOR_HEIGHT 0x9 -#endif - static Bool ms_get_drm_master_fd(ScrnInfoPtr pScrn) { diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.h b/hw/xfree86/drivers/modesetting/drmmode_display.h index ee59711cb..d2dc7c225 100644 --- a/hw/xfree86/drivers/modesetting/drmmode_display.h +++ b/hw/xfree86/drivers/modesetting/drmmode_display.h @@ -285,11 +285,4 @@ void drmmode_copy_fb(ScrnInfoPtr pScrn, drmmode_ptr drmmode); int drmmode_crtc_set_fb(xf86CrtcPtr crtc, DisplayModePtr mode, uint32_t fb_id, int x, int y, uint32_t flags, void *data); -#ifndef DRM_CAP_DUMB_PREFERRED_DEPTH -#define DRM_CAP_DUMB_PREFERRED_DEPTH 3 -#endif -#ifndef DRM_CAP_DUMB_PREFER_SHADOW -#define DRM_CAP_DUMB_PREFER_SHADOW 4 -#endif - #endif