fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-21 15:50:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

llvmpipe: Only use udmabuf with libdrm

Browse source 
It's possible to have the linux/udmabuf.h header but not libdrm in some setups, like under Termux.

Fixes: 112063a060 ("llvmpipe: Only use udmabuf if header is found")
Acked-by: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Reviewed-by: Lucas Fryzek <lfryzek@igalia.com>
Signed-off-by: Valentine Burley <valentine.burley@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30853>
This commit is contained in:
Valentine Burley 2024-08-26 11:36:51 +00:00 • committed by Marge Bot
parent 4fa1709eaf
commit 4cfaf10c10
2 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/gallium/drivers/llvmpipe/lp_screen.c
View file

@ -123,12 +123,12 @@ llvmpipe_get_name(struct pipe_screen *screen)
static int static int
llvmpipe_get_param(struct pipe_screen *screen, enum pipe_cap param) llvmpipe_get_param(struct pipe_screen *screen, enum pipe_cap param)
{ {
#ifdef HAVE_LINUX_UDMABUF_H #if defined(HAVE_LIBDRM) && defined(HAVE_LINUX_UDMABUF_H)
struct llvmpipe_screen *lscreen = llvmpipe_screen(screen); struct llvmpipe_screen *lscreen = llvmpipe_screen(screen);
#endif #endif
switch (param) { switch (param) {
#ifdef HAVE_LINUX_UDMABUF_H #if defined(HAVE_LIBDRM) && defined(HAVE_LINUX_UDMABUF_H)
case PIPE_CAP_DMABUF: case PIPE_CAP_DMABUF:
if (lscreen->udmabuf_fd != -1) if (lscreen->udmabuf_fd != -1)
return DRM_PRIME_CAP_IMPORT | DRM_PRIME_CAP_EXPORT; return DRM_PRIME_CAP_IMPORT | DRM_PRIME_CAP_EXPORT;
@ -1177,7 +1177,7 @@ llvmpipe_create_screen(struct sw_winsys *winsys)
screen->num_threads); screen->num_threads);
screen->num_threads = MIN2(screen->num_threads, LP_MAX_THREADS); screen->num_threads = MIN2(screen->num_threads, LP_MAX_THREADS);
#ifdef HAVE_LINUX_UDMABUF_H #if defined(HAVE_LIBDRM) && defined(HAVE_LINUX_UDMABUF_H)
screen->udmabuf_fd = open("/dev/udmabuf", O_RDWR); screen->udmabuf_fd = open("/dev/udmabuf", O_RDWR);
llvmpipe_init_screen_fence_funcs(&screen->base); llvmpipe_init_screen_fence_funcs(&screen->base);
#endif #endif

24
src/gallium/drivers/llvmpipe/lp_texture.c
View file

@ -63,7 +63,7 @@
#include "drm-uapi/drm_fourcc.h" #include "drm-uapi/drm_fourcc.h"
#endif #endif
#ifdef HAVE_LINUX_UDMABUF_H #if defined(HAVE_LIBDRM) && defined(HAVE_LINUX_UDMABUF_H)
#include <fcntl.h> #include <fcntl.h>
#include <sys/mman.h> #include <sys/mman.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
@ -303,7 +303,7 @@ llvmpipe_resource_create_all(struct pipe_screen *_screen,
pipe_reference_init(&lpr->base.reference, 1); pipe_reference_init(&lpr->base.reference, 1);
lpr->base.screen = &screen->base; lpr->base.screen = &screen->base;
#ifdef HAVE_LINUX_UDMABUF_H #if defined(HAVE_LIBDRM) && defined(HAVE_LINUX_UDMABUF_H)
lpr->dmabuf_alloc = NULL; lpr->dmabuf_alloc = NULL;
#endif #endif
@ -410,7 +410,7 @@ llvmpipe_resource_create(struct pipe_screen *_screen,
return llvmpipe_resource_create_front(_screen, templat, NULL); return llvmpipe_resource_create_front(_screen, templat, NULL);
} }
#ifdef HAVE_LINUX_UDMABUF_H #if defined(HAVE_LIBDRM) && defined(HAVE_LINUX_UDMABUF_H)
static struct pipe_resource * static struct pipe_resource *
llvmpipe_resource_create_with_modifiers(struct pipe_screen *_screen, llvmpipe_resource_create_with_modifiers(struct pipe_screen *_screen,
const struct pipe_resource *templat, const struct pipe_resource *templat,
@ -566,7 +566,7 @@ llvmpipe_resource_destroy(struct pipe_screen *pscreen,
} }
} }
#ifdef HAVE_LINUX_UDMABUF_H #if defined(HAVE_LIBDRM) && defined(HAVE_LINUX_UDMABUF_H)
if (lpr->dmabuf_alloc) if (lpr->dmabuf_alloc)
pscreen->free_memory_fd(pscreen, (struct pipe_memory_allocation*)lpr->dmabuf_alloc); pscreen->free_memory_fd(pscreen, (struct pipe_memory_allocation*)lpr->dmabuf_alloc);
#endif #endif
@ -730,7 +730,7 @@ llvmpipe_resource_from_handle(struct pipe_screen *_screen,
lpr->size_required = lpr->sample_stride; lpr->size_required = lpr->sample_stride;
if (whandle->type != WINSYS_HANDLE_TYPE_UNBACKED) { if (whandle->type != WINSYS_HANDLE_TYPE_UNBACKED) {
#ifdef HAVE_LINUX_UDMABUF_H #if defined(HAVE_LIBDRM) && defined(HAVE_LINUX_UDMABUF_H)
struct llvmpipe_memory_allocation *alloc; struct llvmpipe_memory_allocation *alloc;
uint64_t size; uint64_t size;
/* Not all winsys implement displaytarget_create_mapped so we need to check /* Not all winsys implement displaytarget_create_mapped so we need to check
@ -797,7 +797,7 @@ llvmpipe_resource_get_handle(struct pipe_screen *_screen,
struct sw_winsys *winsys = screen->winsys; struct sw_winsys *winsys = screen->winsys;
struct llvmpipe_resource *lpr = llvmpipe_resource(pt); struct llvmpipe_resource *lpr = llvmpipe_resource(pt);
#ifdef HAVE_LINUX_UDMABUF_H #if defined(HAVE_LIBDRM) && defined(HAVE_LINUX_UDMABUF_H)
if (!lpr->dt && whandle->type == WINSYS_HANDLE_TYPE_FD) { if (!lpr->dt && whandle->type == WINSYS_HANDLE_TYPE_FD) {
if (!lpr->dmabuf_alloc) { if (!lpr->dmabuf_alloc) {
lpr->dmabuf_alloc = (struct llvmpipe_memory_allocation*)_screen->allocate_memory_fd(_screen, lpr->size_required, (int*)&whandle->handle, true); lpr->dmabuf_alloc = (struct llvmpipe_memory_allocation*)_screen->allocate_memory_fd(_screen, lpr->size_required, (int*)&whandle->handle, true);
@ -1345,7 +1345,7 @@ llvmpipe_free_memory(struct pipe_screen *pscreen,
} }
#ifdef HAVE_LINUX_UDMABUF_H #if defined(HAVE_LIBDRM) && defined(HAVE_LINUX_UDMABUF_H)
static void* static void*
llvmpipe_resource_alloc_udmabuf(struct llvmpipe_screen *screen, llvmpipe_resource_alloc_udmabuf(struct llvmpipe_screen *screen,
struct llvmpipe_memory_allocation *alloc, struct llvmpipe_memory_allocation *alloc,
@ -1421,7 +1421,7 @@ llvmpipe_allocate_memory_fd(struct pipe_screen *pscreen,
alloc->mem_fd = -1; alloc->mem_fd = -1;
alloc->dmabuf_fd = -1; alloc->dmabuf_fd = -1;
#ifdef HAVE_LINUX_UDMABUF_H #if defined(HAVE_LIBDRM) && defined(HAVE_LINUX_UDMABUF_H)
if (dmabuf) { if (dmabuf) {
struct llvmpipe_screen *screen = llvmpipe_screen(pscreen); struct llvmpipe_screen *screen = llvmpipe_screen(pscreen);
alloc->type = LLVMPIPE_MEMORY_FD_TYPE_DMA_BUF; alloc->type = LLVMPIPE_MEMORY_FD_TYPE_DMA_BUF;
@ -1460,7 +1460,7 @@ llvmpipe_import_memory_fd(struct pipe_screen *screen,
struct llvmpipe_memory_allocation *alloc = CALLOC_STRUCT(llvmpipe_memory_allocation); struct llvmpipe_memory_allocation *alloc = CALLOC_STRUCT(llvmpipe_memory_allocation);
alloc->mem_fd = -1; alloc->mem_fd = -1;
alloc->dmabuf_fd = -1; alloc->dmabuf_fd = -1;
#ifdef HAVE_LINUX_UDMABUF_H #if defined(HAVE_LIBDRM) && defined(HAVE_LINUX_UDMABUF_H)
if (dmabuf) { if (dmabuf) {
off_t mmap_size = lseek(fd, 0, SEEK_END); off_t mmap_size = lseek(fd, 0, SEEK_END);
lseek(fd, 0, SEEK_SET); lseek(fd, 0, SEEK_SET);
@ -1505,7 +1505,7 @@ llvmpipe_free_memory_fd(struct pipe_screen *screen,
if (alloc->type == LLVMPIPE_MEMORY_FD_TYPE_OPAQUE) { if (alloc->type == LLVMPIPE_MEMORY_FD_TYPE_OPAQUE) {
os_free_fd(alloc->cpu_addr); os_free_fd(alloc->cpu_addr);
} }
#ifdef HAVE_LINUX_UDMABUF_H #if defined(HAVE_LIBDRM) && defined(HAVE_LINUX_UDMABUF_H)
else { else {
munmap(alloc->cpu_addr, alloc->size); munmap(alloc->cpu_addr, alloc->size);
if (alloc->dmabuf_fd >= 0) if (alloc->dmabuf_fd >= 0)
@ -1720,7 +1720,7 @@ llvmpipe_resource_get_param(struct pipe_screen *screen,
return false; return false;
} }
#ifdef HAVE_LINUX_UDMABUF_H #if defined(HAVE_LIBDRM) && defined(HAVE_LINUX_UDMABUF_H)
static void static void
llvmpipe_query_dmabuf_modifiers(struct pipe_screen *pscreen, enum pipe_format format, int max, uint64_t *modifiers, unsigned int *external_only, int *count) llvmpipe_query_dmabuf_modifiers(struct pipe_screen *pscreen, enum pipe_format format, int max, uint64_t *modifiers, unsigned int *external_only, int *count)
{ {
@ -1781,7 +1781,7 @@ llvmpipe_init_screen_resource_funcs(struct pipe_screen *screen)
screen->import_memory_fd = llvmpipe_import_memory_fd; screen->import_memory_fd = llvmpipe_import_memory_fd;
screen->free_memory_fd = llvmpipe_free_memory_fd; screen->free_memory_fd = llvmpipe_free_memory_fd;
#endif #endif
#ifdef HAVE_LINUX_UDMABUF_H #if defined(HAVE_LIBDRM) && defined(HAVE_LINUX_UDMABUF_H)
screen->query_dmabuf_modifiers = llvmpipe_query_dmabuf_modifiers; screen->query_dmabuf_modifiers = llvmpipe_query_dmabuf_modifiers;
screen->is_dmabuf_modifier_supported = llvmpipe_is_dmabuf_modifier_supported; screen->is_dmabuf_modifier_supported = llvmpipe_is_dmabuf_modifier_supported;
screen->get_dmabuf_modifier_planes = llvmpipe_get_dmabuf_modifier_planes; screen->get_dmabuf_modifier_planes = llvmpipe_get_dmabuf_modifier_planes;