fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-01 23:18:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

gbm: inline dri2_from_dma_bufs and delete now-redundant check in dmabuf import

Browse source 
dri will check this

Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30472>
This commit is contained in:
Mike Blumenkrantz 2024-07-26 16:08:51 -04:00 • committed by Marge Bot
parent 9362ae7ecd
commit 59e4d558ba
1 changed files with 10 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/gbm/backends/dri/gbm_dri.c
View file

@ -738,15 +738,15 @@ gbm_dri_bo_import(struct gbm_device *gbm,
* the sARGB format. */
fourcc = gbm_core.v0.format_canonicalize(fd_data->format);
image = dri->image->createImageFromDmaBufs(dri->screen,
fd_data->width,
fd_data->height,
fourcc,
DRM_FORMAT_MOD_INVALID,
&fd_data->fd, 1,
&stride, &offset,
0, 0, 0, 0, 0,
NULL, NULL);
image = dri2_from_dma_bufs(dri->screen,
fd_data->width,
fd_data->height,
fourcc,
DRM_FORMAT_MOD_INVALID,
&fd_data->fd, 1,
&stride, &offset,
0, 0, 0, 0, 0,
NULL, NULL);
if (image == NULL) {
errno = EINVAL;
return NULL;
@ -761,18 +761,12 @@ gbm_dri_bo_import(struct gbm_device *gbm,
unsigned int error;
int fourcc;
/* Import with modifier requires createImageFromDmaBufs */
if (dri->image->createImageFromDmaBufs == NULL) {
errno = ENOSYS;
return NULL;
}
/* GBM's GBM_FORMAT_* tokens are a strict superset of the DRI FourCC
* tokens accepted by createImageFromDmaBufs, except for not supporting
* the sARGB format. */
fourcc = gbm_core.v0.format_canonicalize(fd_data->format);
image = dri->image->createImageFromDmaBufs(dri->screen, fd_data->width,
image = dri2_from_dma_bufs(dri->screen, fd_data->width,
fd_data->height, fourcc,
fd_data->modifier,
fd_data->fds,