fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-20 16:00:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'dumb-dmabuf' into 'main'

Browse source 
gbm: Implement dmabuf import/export for dumb buffers

See merge request mesa/mesa!38982
This commit is contained in:
stefan11111 2025-12-20 01:07:59 +00:00
commit 092f6e7135
1 changed files with 58 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -32,6 +32,7 @@
#include <stdbool.h> #include <stdbool.h>
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#include <fcntl.h> /* for O_RDWR, which DRM_RDWR is defined as */
#include <limits.h> #include <limits.h>
#include <assert.h> #include <assert.h>
#include <sys/types.h> #include <sys/types.h>
@ -446,8 +447,19 @@ gbm_dri_bo_get_fd(struct gbm_bo *_bo)
struct gbm_dri_bo *bo = gbm_dri_bo(_bo); struct gbm_dri_bo *bo = gbm_dri_bo(_bo);
int fd; int fd;
if (bo->image == NULL) if (bo->image == NULL) {
#ifdef HAVE_LIBDRM
struct gbm_dri_device *dri = gbm_dri_device(_bo->gbm);
if (dri->has_dmabuf_export) {
int ret;
int prime_fd = -1;
ret = drmPrimeHandleToFD(dri->base.v0.fd, bo->handle, DRM_RDWR, &prime_fd);
if (!ret)
return prime_fd;
}
#endif
return -1; return -1;
}
if (!dri2_query_image(bo->image, __DRI_IMAGE_ATTRIB_FD, &fd)) if (!dri2_query_image(bo->image, __DRI_IMAGE_ATTRIB_FD, &fd))
return -1; return -1;
@ -664,6 +676,43 @@ gbm_dri_bo_destroy(struct gbm_bo *_bo)
free(bo); free(bo);
} }
static struct gbm_bo *
dumb_bo_from_fd(struct gbm_device *gbm,
struct gbm_import_fd_data *fd_data)
{
#ifdef HAVE_LIBDRM
struct gbm_dri_bo *bo;
int ret;
uint32_t handle;
bo = calloc(1, sizeof *bo);
if (bo == NULL) {
errno = ENOMEM;
return NULL;
}
ret = drmPrimeFDToHandle(gbm->v0.fd, fd_data->fd, &handle);
if (ret) {
free(bo);
return NULL;
}
bo->base.gbm = gbm;
bo->base.v0.width = fd_data->width;
bo->base.v0.height = fd_data->height;
bo->base.v0.stride = fd_data->stride;
bo->base.v0.format = fd_data->format;
bo->base.v0.handle.u32 = handle;
bo->handle = handle;
bo->size = fd_data->stride * fd_data->height;
return &bo->base;
#else
errno = ENOSYS;
return NULL;
#endif
}
static struct gbm_bo * static struct gbm_bo *
gbm_dri_bo_import(struct gbm_device *gbm, gbm_dri_bo_import(struct gbm_device *gbm,
uint32_t type, void *buffer, uint32_t usage) uint32_t type, void *buffer, uint32_t usage)
@ -738,6 +787,9 @@ gbm_dri_bo_import(struct gbm_device *gbm,
* the sARGB format. */ * the sARGB format. */
fourcc = core->v0.format_canonicalize(fd_data->format); fourcc = core->v0.format_canonicalize(fd_data->format);
if (!dri->screen)
return dumb_bo_from_fd(gbm, fd_data);
image = dri2_from_dma_bufs(dri->screen, image = dri2_from_dma_bufs(dri->screen,
fd_data->width, fd_data->width,
fd_data->height, fd_data->height,
@ -766,6 +818,11 @@ gbm_dri_bo_import(struct gbm_device *gbm,
* the sARGB format. */ * the sARGB format. */
fourcc = core->v0.format_canonicalize(fd_data->format); fourcc = core->v0.format_canonicalize(fd_data->format);
if (!dri->screen) {
errno = EINVAL;
return NULL;
}
image = dri2_from_dma_bufs(dri->screen, fd_data->width, image = dri2_from_dma_bufs(dri->screen, fd_data->width,
fd_data->height, fourcc, fd_data->height, fourcc,
fd_data->modifier, fd_data->modifier,