From 59e4d558ba25a662a7a8dee4a8674878e1cf3ac7 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 26 Jul 2024 16:08:51 -0400 Subject: [PATCH] gbm: inline dri2_from_dma_bufs and delete now-redundant check in dmabuf import dri will check this Reviewed-by: Adam Jackson Part-of: --- src/gbm/backends/dri/gbm_dri.c | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/src/gbm/backends/dri/gbm_dri.c b/src/gbm/backends/dri/gbm_dri.c index d5dfbe142ef..bee8231bc4b 100644 --- a/src/gbm/backends/dri/gbm_dri.c +++ b/src/gbm/backends/dri/gbm_dri.c @@ -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,