From 8f912fa4aa7c016fddf44e4db7583407dd79e51f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= Date: Tue, 24 Jun 2025 22:40:23 +0200 Subject: [PATCH] modesetting: Don't try to use modifiers when allocating the root pixmap We want the root pixmap to use conservative tiling modifiers in order to make sure modeset/etc can never fail due to hardware watermark restictions/etc. Currenlty this is all dead code anyway because we aren't actually parsing the IN_FORMATS blob (missing universal plane client cap). But we want to start parsing that, so let's first make sure we don't get any behavioural changes from doing so. Signed-off-by: notbabaisyou --- .../drivers/modesetting/drmmode_display.c | 20 ------------------- 1 file changed, 20 deletions(-) diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c index f28c3596b..29b02867e 100644 --- a/hw/xfree86/drivers/modesetting/drmmode_display.c +++ b/hw/xfree86/drivers/modesetting/drmmode_display.c @@ -1114,10 +1114,6 @@ drmmode_create_bo(drmmode_ptr drmmode, drmmode_bo *bo, #ifdef GLAMOR_HAS_GBM if (drmmode->glamor) { -#ifdef GBM_BO_WITH_MODIFIERS - uint32_t num_modifiers; - uint64_t *modifiers = NULL; -#endif uint32_t format; switch (drmmode->scrn->depth) { @@ -1135,22 +1131,6 @@ drmmode_create_bo(drmmode_ptr drmmode, drmmode_bo *bo, break; } -#ifdef GBM_BO_WITH_MODIFIERS - num_modifiers = get_modifiers_set(drmmode->scrn, format, &modifiers, - FALSE, TRUE); - if (num_modifiers > 0 && - !(num_modifiers == 1 && modifiers[0] == DRM_FORMAT_MOD_INVALID)) { - bo->gbm = gbm_bo_create_with_modifiers(drmmode->gbm, width, height, - format, modifiers, - num_modifiers); - free(modifiers); - if (bo->gbm) { - bo->used_modifiers = TRUE; - return TRUE; - } - } -#endif - bo->gbm = gbm_bo_create(drmmode->gbm, width, height, format, GBM_BO_USE_RENDERING | GBM_BO_USE_SCANOUT); bo->used_modifiers = FALSE;