From d0214596ae2a4a5fefba93ab41fc12b63395a3b5 Mon Sep 17 00:00:00 2001 From: Pierre-Eric Pelloux-Prayer Date: Fri, 22 Nov 2024 11:14:59 +0100 Subject: [PATCH 1/2] modesetting: use gbm_bo_create_with_modifiers2 when possible Use GBM_BO_USE_SCANOUT by default, and add an argument to drmmode_create_bo so the callers can pass other flags. Signed-off-by: Pierre-Eric Pelloux-Prayer --- .../drivers/modesetting/drmmode_display.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c index bd895fe96..902643820 100644 --- a/hw/xfree86/drivers/modesetting/drmmode_display.c +++ b/hw/xfree86/drivers/modesetting/drmmode_display.c @@ -1108,7 +1108,8 @@ drmmode_bo_import(drmmode_ptr drmmode, drmmode_bo *bo, static Bool drmmode_create_bo(drmmode_ptr drmmode, drmmode_bo *bo, - unsigned width, unsigned height, unsigned bpp) + unsigned width, unsigned height, unsigned bpp, + uint32_t gbm_bo_use_flag) { bo->width = width; bo->height = height; @@ -1141,9 +1142,16 @@ drmmode_create_bo(drmmode_ptr drmmode, drmmode_bo *bo, FALSE, TRUE); if (num_modifiers > 0 && !(num_modifiers == 1 && modifiers[0] == DRM_FORMAT_MOD_INVALID)) { +#ifdef GBM_BO_WITH_MODIFIERS2 + bo->gbm = gbm_bo_create_with_modifiers2(drmmode->gbm, width, height, + format, modifiers, + num_modifiers, + GBM_BO_USE_SCANOUT | gbm_bo_use_flag); +#else bo->gbm = gbm_bo_create_with_modifiers(drmmode->gbm, width, height, format, modifiers, num_modifiers); +#endif free(modifiers); if (bo->gbm) { bo->used_modifiers = TRUE; @@ -1153,7 +1161,7 @@ drmmode_create_bo(drmmode_ptr drmmode, drmmode_bo *bo, #endif bo->gbm = gbm_bo_create(drmmode->gbm, width, height, format, - GBM_BO_USE_RENDERING | GBM_BO_USE_SCANOUT); + GBM_BO_USE_RENDERING | GBM_BO_USE_SCANOUT | gbm_bo_use_flag); bo->used_modifiers = FALSE; return bo->gbm != NULL; } @@ -2117,7 +2125,7 @@ drmmode_shadow_fb_allocate(xf86CrtcPtr crtc, int width, int height, drmmode_ptr drmmode = drmmode_crtc->drmmode; int ret; - if (!drmmode_create_bo(drmmode, bo, width, height, drmmode->kbpp)) { + if (!drmmode_create_bo(drmmode, bo, width, height, drmmode->kbpp, 0)) { xf86DrvMsg(crtc->scrn->scrnIndex, X_ERROR, "Couldn't allocate shadow memory for rotated CRTC\n"); return NULL; @@ -3669,7 +3677,7 @@ drmmode_xf86crtc_resize(ScrnInfoPtr scrn, int width, int height) drmmode->fb_id = 0; if (!drmmode_create_bo(drmmode, &drmmode->front_bo, - width, height, drmmode->kbpp)) + width, height, drmmode->kbpp, 0)) goto fail; pitch = drmmode_bo_get_pitch(&drmmode->front_bo); @@ -4450,7 +4458,7 @@ drmmode_create_initial_bos(ScrnInfoPtr pScrn, drmmode_ptr drmmode) width = pScrn->virtualX; height = pScrn->virtualY; - if (!drmmode_create_bo(drmmode, &drmmode->front_bo, width, height, bpp)) + if (!drmmode_create_bo(drmmode, &drmmode->front_bo, width, height, bpp, 0)) return FALSE; pScrn->displayWidth = drmmode_bo_get_pitch(&drmmode->front_bo) / cpp; From 696e6a046ce76dfa6e62abe1effd0e2339ab2b0a Mon Sep 17 00:00:00 2001 From: Pierre-Eric Pelloux-Prayer Date: Fri, 22 Nov 2024 15:18:29 +0100 Subject: [PATCH 2/2] modesetting: use GBM_BO_USE_FRONT_RENDERING for front_bo This flag is useful for drivers that need to take some action to deal with front buffer rendering. For instance, disabling framebuffer compression. Signed-off-by: Pierre-Eric Pelloux-Prayer --- hw/xfree86/drivers/modesetting/drmmode_display.c | 14 ++++++++++++-- include/meson.build | 2 ++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c index 902643820..997be6f43 100644 --- a/hw/xfree86/drivers/modesetting/drmmode_display.c +++ b/hw/xfree86/drivers/modesetting/drmmode_display.c @@ -3677,7 +3677,12 @@ drmmode_xf86crtc_resize(ScrnInfoPtr scrn, int width, int height) drmmode->fb_id = 0; if (!drmmode_create_bo(drmmode, &drmmode->front_bo, - width, height, drmmode->kbpp, 0)) + width, height, drmmode->kbpp, +#ifdef HAVE_GBM_BO_USE_FRONT_RENDERING + GBM_BO_USE_FRONT_RENDERING)) +#else + 0)) +#endif goto fail; pitch = drmmode_bo_get_pitch(&drmmode->front_bo); @@ -4458,7 +4463,12 @@ drmmode_create_initial_bos(ScrnInfoPtr pScrn, drmmode_ptr drmmode) width = pScrn->virtualX; height = pScrn->virtualY; - if (!drmmode_create_bo(drmmode, &drmmode->front_bo, width, height, bpp, 0)) + if (!drmmode_create_bo(drmmode, &drmmode->front_bo, width, height, bpp, +#ifdef HAVE_GBM_BO_USE_FRONT_RENDERING + GBM_BO_USE_FRONT_RENDERING)) +#else + 0)) +#endif return FALSE; pScrn->displayWidth = drmmode_bo_get_pitch(&drmmode->front_bo) / cpp; diff --git a/include/meson.build b/include/meson.build index e57ea92f3..d0bf64f78 100644 --- a/include/meson.build +++ b/include/meson.build @@ -116,6 +116,8 @@ conf_data.set('GBM_BO_FD_FOR_PLANE', build_glamor and gbm_dep.found() and gbm_dep.version().version_compare('>= 21.1') ? '1' : false) conf_data.set('GBM_BO_WITH_MODIFIERS2', build_glamor and gbm_dep.found() and gbm_dep.version().version_compare('>= 21.3') ? '1' : false) +conf_data.set('HAVE_GBM_BO_USE_FRONT_RENDERING', + build_glamor and gbm_dep.found() and gbm_dep.version().version_compare('>= 22.3') ? '1' : false) conf_data.set_quoted('SERVER_MISC_CONFIG_PATH', serverconfigdir) conf_data.set_quoted('PROJECTROOT', get_option('prefix'))