frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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 <though-went-some-simple@proton.me>
This commit is contained in:
Ville Syrjälä 2025-06-24 22:40:23 +02:00 committed by notbabaisyou
parent 9c0b9cf21d
commit 8f912fa4aa
1 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hw/xfree86/drivers/modesetting/drmmode_display.c
View File

@ -1114,10 +1114,6 @@ drmmode_create_bo(drmmode_ptr drmmode, drmmode_bo *bo,
#ifdef GLAMOR_HAS_GBM #ifdef GLAMOR_HAS_GBM
if (drmmode->glamor) { if (drmmode->glamor) {
#ifdef GBM_BO_WITH_MODIFIERS
uint32_t num_modifiers;
uint64_t *modifiers = NULL;
#endif
uint32_t format; uint32_t format;
switch (drmmode->scrn->depth) { switch (drmmode->scrn->depth) {
@ -1135,22 +1131,6 @@ drmmode_create_bo(drmmode_ptr drmmode, drmmode_bo *bo,
break; 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, 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);
bo->used_modifiers = FALSE; bo->used_modifiers = FALSE;