hyprwm/wlroots-hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/wlroots-hyprland.git synced 2024-11-22 12:55:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

Revert "backend/drm: fail instead of stripping a modifier"

Browse source 
This reverts commit f9f90b4173.

gbm_bo_get_modifier may return a modifier in these cases:

- The kernel doesn't support modifiers but Mesa does
- WLR_DRM_NO_MODIFIERS=1 is set

However, in both of these cases, the gbm_bo has been allocated
without modifiers.

There is already a check in drm_fb_create for modifiers:
wlr_drm_format_set_has will make sure buffers with an explicit
modifier will be rejected if the DRM backend doesn't support them.
So no need for an additional check in get_fb_for_bo.

Closes: https://github.com/swaywm/wlroots/issues/2896
This commit is contained in:
Simon Ser 2021-04-27 15:28:39 +02:00 committed by Kenny Levinsen
parent 4839664a92
commit 0411dc0663
1 changed files with 0 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
backend/drm/util.c
View file

@ -199,14 +199,6 @@ uint32_t get_fb_for_bo(struct gbm_bo *bo, bool with_modifiers) {
wlr_log_errno(WLR_ERROR, "Unable to add DRM framebuffer"); wlr_log_errno(WLR_ERROR, "Unable to add DRM framebuffer");
} }
} else { } else {
if (gbm_bo_get_modifier(bo) != DRM_FORMAT_MOD_INVALID &&
gbm_bo_get_modifier(bo) != DRM_FORMAT_MOD_LINEAR) {
wlr_log(WLR_ERROR, "Failed to add DRM frame-buffer: "
"BO has modifier 0x%"PRIX64" but KMS doesn't support modifiers",
gbm_bo_get_modifier(bo));
return 0;
}
int ret = drmModeAddFB2(fd, width, height, format, handles, strides, int ret = drmModeAddFB2(fd, width, height, format, handles, strides,
offsets, &id, 0); offsets, &id, 0);
if (ret != 0 && gbm_bo_get_format(bo) == GBM_FORMAT_ARGB8888 && if (ret != 0 && gbm_bo_get_format(bo) == GBM_FORMAT_ARGB8888 &&