From cef7cda8517abee08d5af4a606301571b6dc2153 Mon Sep 17 00:00:00 2001 From: stefan11111 Date: Wed, 20 Aug 2025 18:09:43 +0300 Subject: [PATCH] include: modesetting: rename LIBDRM_PLANE_SIZE_HINTS to LIBDRM_HAS_PLANE_SIZE_HINTS Signed-off-by: stefan11111 --- hw/xfree86/drivers/video/modesetting/drmmode_display.c | 6 +++--- include/meson.build | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/xfree86/drivers/video/modesetting/drmmode_display.c b/hw/xfree86/drivers/video/modesetting/drmmode_display.c index fd24bba3c..2c233738f 100644 --- a/hw/xfree86/drivers/video/modesetting/drmmode_display.c +++ b/hw/xfree86/drivers/video/modesetting/drmmode_display.c @@ -2389,7 +2389,7 @@ populate_format_modifiers(xf86CrtcPtr crtc, const drmModePlane *kplane, return TRUE; } -#ifdef LIBDRM_PLANE_SIZE_HINTS +#ifdef LIBDRM_HAS_PLANE_SIZE_HINTS static void populate_cursor_sizes(drmmode_ptr drmmode, drmmode_crtc_private_ptr drmmode_crtc, int size_hints_blob) { @@ -2414,7 +2414,7 @@ populate_cursor_sizes(drmmode_ptr drmmode, drmmode_crtc_private_ptr drmmode_crtc if (!size_hints_len) goto fail; - + drmmode_crtc->cursor.num_dimensions = size_hints_len; drmmode_crtc->cursor.dimensions = xnfrealloc(drmmode_crtc->cursor.dimensions, size_hints_len * sizeof(drmmode_cursor_dim_rec)); @@ -2772,7 +2772,7 @@ drmmode_crtc_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, drmModeResPtr mode_res drmModeFreeObjectProperties(props); drmmode_crtc_create_planes(crtc, num); -#ifdef LIBDRM_PLANE_SIZE_HINTS +#ifdef LIBDRM_HAS_PLANE_SIZE_HINTS /* Get the SIZE_HINT dimensions, if supported. */ drmmode_crtc_probe_size_hint(crtc, num); #endif diff --git a/include/meson.build b/include/meson.build index 12fa089ae..e9d506116 100644 --- a/include/meson.build +++ b/include/meson.build @@ -101,7 +101,7 @@ conf_data.set('CONFIG_WSCONS', host_machine.system() in ['openbsd', 'netbsd'] ? conf_data.set('HAVE_XSHMFENCE', xshmfence_dep.found() ? '1' : false) conf_data.set('WITH_LIBDRM', libdrm_required ? '1' : false) -conf_data.set('LIBDRM_PLANE_SIZE_HINTS', libdrm_required ? libdrm_dep.version().version_compare('>= 2.4.122') : false) +conf_data.set('LIBDRM_HAS_PLANE_SIZE_HINTS', libdrm_required ? libdrm_dep.version().version_compare('>= 2.4.122') : false) conf_data.set('GLAMOR_HAS_EGL_QUERY_DMABUF', epoxy_dep.found() and epoxy_dep.version().version_compare('>= 1.4.4') ? '1' : false) conf_data.set('GLAMOR_HAS_EGL_QUERY_DRIVER',