Skip to content

Commit 671a8ee

Browse files
vsyrjalametux
authored andcommitted
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 <[email protected]>
1 parent d26d08c commit 671a8ee

File tree

1 file changed

+0
-20
lines changed

1 file changed

+0
-20
lines changed

hw/xfree86/drivers/video/modesetting/drmmode_display.c

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1118,10 +1118,6 @@ drmmode_create_bo(drmmode_ptr drmmode, drmmode_bo *bo,
11181118

11191119
#ifdef GLAMOR_HAS_GBM
11201120
if (drmmode->glamor) {
1121-
#ifdef GBM_BO_WITH_MODIFIERS
1122-
uint32_t num_modifiers;
1123-
uint64_t *modifiers = NULL;
1124-
#endif
11251121
uint32_t format;
11261122

11271123
switch (drmmode->scrn->depth) {
@@ -1139,22 +1135,6 @@ drmmode_create_bo(drmmode_ptr drmmode, drmmode_bo *bo,
11391135
break;
11401136
}
11411137

1142-
#ifdef GBM_BO_WITH_MODIFIERS
1143-
num_modifiers = get_modifiers_set(drmmode->scrn, format, &modifiers,
1144-
FALSE, TRUE);
1145-
if (num_modifiers > 0 &&
1146-
!(num_modifiers == 1 && modifiers[0] == DRM_FORMAT_MOD_INVALID)) {
1147-
bo->gbm = gbm_bo_create_with_modifiers(drmmode->gbm, width, height,
1148-
format, modifiers,
1149-
num_modifiers);
1150-
free(modifiers);
1151-
if (bo->gbm) {
1152-
bo->used_modifiers = TRUE;
1153-
return TRUE;
1154-
}
1155-
}
1156-
#endif
1157-
11581138
bo->gbm = gbm_bo_create(drmmode->gbm, width, height, format,
11591139
GBM_BO_USE_RENDERING | GBM_BO_USE_SCANOUT);
11601140
bo->used_modifiers = FALSE;

0 commit comments

Comments
 (0)