From 5ea02f900c3c5ac0f82c914b698559352a67330a Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Thu, 8 Jul 2021 12:11:10 +0200 Subject: [PATCH] backend/drm: force linear layout for multi-GPU buffers Some buffers need to be copied across GPUs. Such buffers need to be allocated with a format and modifier suitable for both the source and the destination. When explicit modifiers aren't supported, we were forcing the buffers to be allocated with a linear layout, because implicit modifiers aren't portable across GPUs. All is well with this case. When explicit modifiers are supported, we were advertising the whole list of destination modifiers, in the hope that the source might have some in common and might be able to allocate a buffer with a more optimized layout. This works well if the source supports explicit modifiers. However, if the source doesn't, then wlr_drm_format_intersect will fallback to implicit modifiers, and everything goes boom: the source uses a GPU-specific tiling and the destination interprets it as linear. To avoid this, just force linear unconditionally. We'll be able to revert this once we have a good way to indicate that an implicit modifier isn't supported in wlr_drm_format_set, see [1]. [1]: https://github.com/swaywm/wlroots/pull/2815 Closes: https://github.com/swaywm/wlroots/issues/3030 (cherry picked from commit d71ed635b90a12c1f1d096817aec9d00b2ad6a3d) --- backend/drm/backend.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/backend/drm/backend.c b/backend/drm/backend.c index 94f6fc52..c125e399 100644 --- a/backend/drm/backend.c +++ b/backend/drm/backend.c @@ -249,21 +249,15 @@ struct wlr_backend *wlr_drm_backend_create(struct wl_display *display, goto error_event; } + // Force a linear layout. In case explicit modifiers aren't supported, + // the meaning of implicit modifiers changes from one GPU to the other. + // In case explicit modifiers are supported, we still have no guarantee + // that the buffer producer will support these, so they might fallback + // to implicit modifiers. for (size_t i = 0; i < texture_formats->len; i++) { const struct wlr_drm_format *fmt = texture_formats->formats[i]; - if (fmt->len == 0) { - // Modifiers aren't supported. The implicit modifier changes - // from a GPU to the other, so we can only accept linear - // buffers - wlr_drm_format_set_add(&drm->mgpu_formats, fmt->format, - DRM_FORMAT_MOD_LINEAR); - continue; - } - - for (size_t j = 0; j < fmt->len; j++) { - wlr_drm_format_set_add(&drm->mgpu_formats, fmt->format, - fmt->modifiers[j]); - } + wlr_drm_format_set_add(&drm->mgpu_formats, fmt->format, + DRM_FORMAT_MOD_LINEAR); } }