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

xwayland: only use linux-dmabuf if format/modifier was advertised 

Previously, linux-dmabuf was used unconditionally if the buffer had a
modifier. However creating a linux-dmabuf buffer with a format/modifier
which hasn't been advertised will fail.

Change xwl_glamor_gbm_get_wl_buffer_for_pixmap to use linux-dmabuf when
the format/modifier has been advertised only.

Signed-off-by: Simon Ser <contact@emersion.fr>
Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1035
Tested-by: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
This commit is contained in:
Simon Ser 2020-06-02 15:28:38 +02:00 committed by Michel Dänzer
parent 9c8d274458
commit c0e13cbf5a
1 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
hw/xwayland/xwayland-glamor-gbm.c
View File

@ -293,6 +293,9 @@ xwl_glamor_gbm_get_wl_buffer_for_pixmap(PixmapPtr pixmap,
struct xwl_gbm_private *xwl_gbm = xwl_gbm_get(xwl_screen); struct xwl_gbm_private *xwl_gbm = xwl_gbm_get(xwl_screen);
unsigned short width = pixmap->drawable.width; unsigned short width = pixmap->drawable.width;
unsigned short height = pixmap->drawable.height; unsigned short height = pixmap->drawable.height;
uint32_t format;
struct xwl_format *xwl_format = NULL;
Bool modifier_supported = FALSE;
int prime_fd; int prime_fd;
int num_planes; int num_planes;
uint32_t strides[4]; uint32_t strides[4];
@ -317,6 +320,8 @@ xwl_glamor_gbm_get_wl_buffer_for_pixmap(PixmapPtr pixmap,
if (!xwl_pixmap->bo) if (!xwl_pixmap->bo)
return NULL; return NULL;
format = wl_drm_format_for_depth(pixmap->drawable.depth);
prime_fd = gbm_bo_get_fd(xwl_pixmap->bo); prime_fd = gbm_bo_get_fd(xwl_pixmap->bo);
if (prime_fd == -1) if (prime_fd == -1)
return NULL; return NULL;
@ -335,7 +340,23 @@ xwl_glamor_gbm_get_wl_buffer_for_pixmap(PixmapPtr pixmap,
offsets[0] = 0; offsets[0] = 0;
#endif #endif
if (xwl_gbm->dmabuf && modifier != DRM_FORMAT_MOD_INVALID) { for (i = 0; i < xwl_screen->num_formats; i++) {
if (xwl_screen->formats[i].format == format) {
xwl_format = &xwl_screen->formats[i];
break;
}
}
if (xwl_format) {
for (i = 0; i < xwl_format->num_modifiers; i++) {
if (xwl_format->modifiers[i] == modifier) {
modifier_supported = TRUE;
break;
}
}
}
if (xwl_gbm->dmabuf && modifier_supported) {
struct zwp_linux_buffer_params_v1 *params; struct zwp_linux_buffer_params_v1 *params;
params = zwp_linux_dmabuf_v1_create_params(xwl_gbm->dmabuf); params = zwp_linux_dmabuf_v1_create_params(xwl_gbm->dmabuf);
@ -347,13 +368,12 @@ xwl_glamor_gbm_get_wl_buffer_for_pixmap(PixmapPtr pixmap,
xwl_pixmap->buffer = xwl_pixmap->buffer =
zwp_linux_buffer_params_v1_create_immed(params, width, height, zwp_linux_buffer_params_v1_create_immed(params, width, height,
wl_drm_format_for_depth(pixmap->drawable.depth), format, 0);
0);
zwp_linux_buffer_params_v1_destroy(params); zwp_linux_buffer_params_v1_destroy(params);
} else if (num_planes == 1) { } else if (num_planes == 1) {
xwl_pixmap->buffer = xwl_pixmap->buffer =
wl_drm_create_prime_buffer(xwl_gbm->drm, prime_fd, width, height, wl_drm_create_prime_buffer(xwl_gbm->drm, prime_fd, width, height,
wl_drm_format_for_depth(pixmap->drawable.depth), format,
0, gbm_bo_get_stride(xwl_pixmap->bo), 0, gbm_bo_get_stride(xwl_pixmap->bo),
0, 0, 0, 0,
0, 0); 0, 0);