mirrors/mesa
0
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2024-11-23 18:24:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

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>
(cherry picked from commit 4cfaf10c10)
This commit is contained in:
Valentine Burley 2024-08-26 11:36:51 +00:00 committed by Eric Engestrom
parent 1a04c98ed6
commit 46695f7cca
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.pick_status.json
View File

@ -714,7 +714,7 @@
"description": "llvmpipe: Only use udmabuf with libdrm",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "112063a060ef2603e66f5ee375346b2d24508c2b",
"notes": null

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

@ -122,12 +122,12 @@ llvmpipe_get_name(struct pipe_screen *screen)
static int
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);
#endif
switch (param) {
#ifdef HAVE_LINUX_UDMABUF_H
#if defined(HAVE_LIBDRM) && defined(HAVE_LINUX_UDMABUF_H)
case PIPE_CAP_DMABUF:
if (lscreen->udmabuf_fd != -1)
return DRM_PRIME_CAP_IMPORT | DRM_PRIME_CAP_EXPORT;
@ -1158,7 +1158,7 @@ llvmpipe_create_screen(struct sw_winsys *winsys)
screen->num_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);
#endif

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

@ -58,7 +58,7 @@
#include "drm-uapi/drm_fourcc.h"
#endif
#ifdef HAVE_LINUX_UDMABUF_H
#if defined(HAVE_LIBDRM) && defined(HAVE_LINUX_UDMABUF_H)
#include <fcntl.h>
#include <sys/mman.h>
#include <sys/ioctl.h>
@ -263,7 +263,7 @@ llvmpipe_resource_create_all(struct pipe_screen *_screen,
pipe_reference_init(&lpr->base.reference, 1);
lpr->base.screen = &screen->base;
#ifdef HAVE_LINUX_UDMABUF_H
#if defined(HAVE_LIBDRM) && defined(HAVE_LINUX_UDMABUF_H)
lpr->dmabuf_alloc = NULL;
#endif
@ -351,7 +351,7 @@ llvmpipe_resource_create(struct pipe_screen *_screen,
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 *
llvmpipe_resource_create_with_modifiers(struct pipe_screen *_screen,
const struct pipe_resource *templat,
@ -507,7 +507,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)
pscreen->free_memory_fd(pscreen, (struct pipe_memory_allocation*)lpr->dmabuf_alloc);
#endif
@ -661,7 +661,7 @@ llvmpipe_resource_from_handle(struct pipe_screen *_screen,
if (whandle->type != WINSYS_HANDLE_TYPE_UNBACKED) {
void *data;
#ifdef HAVE_LINUX_UDMABUF_H
#if defined(HAVE_LIBDRM) && defined(HAVE_LINUX_UDMABUF_H)
struct llvmpipe_memory_fd_alloc *alloc;
uint64_t size;
/* Not all winsys implement displaytarget_create_mapped so we need to check
@ -736,7 +736,7 @@ llvmpipe_resource_get_handle(struct pipe_screen *_screen,
struct llvmpipe_resource *lpr = llvmpipe_resource(pt);
whandle->stride = lpr->row_stride[0];
#ifdef HAVE_LINUX_UDMABUF_H
#if defined(HAVE_LIBDRM) && defined(HAVE_LINUX_UDMABUF_H)
whandle->modifier = DRM_FORMAT_MOD_LINEAR;
if (!lpr->dt && whandle->type == WINSYS_HANDLE_TYPE_FD) {
if (!lpr->dmabuf_alloc) {
@ -1118,7 +1118,7 @@ llvmpipe_free_memory(struct pipe_screen *screen,
}
#ifdef HAVE_LINUX_UDMABUF_H
#if defined(HAVE_LIBDRM) && defined(HAVE_LINUX_UDMABUF_H)
static void*
llvmpipe_resource_alloc_udmabuf(struct llvmpipe_screen *screen,
struct llvmpipe_memory_fd_alloc *alloc,
@ -1194,7 +1194,7 @@ llvmpipe_allocate_memory_fd(struct pipe_screen *pscreen,
alloc->mem_fd = -1;
alloc->dmabuf_fd = -1;
#ifdef HAVE_LINUX_UDMABUF_H
#if defined(HAVE_LIBDRM) && defined(HAVE_LINUX_UDMABUF_H)
if (dmabuf) {
struct llvmpipe_screen *screen = llvmpipe_screen(pscreen);
alloc->type = LLVMPIPE_MEMORY_FD_TYPE_DMA_BUF;
@ -1233,7 +1233,7 @@ llvmpipe_import_memory_fd(struct pipe_screen *screen,
struct llvmpipe_memory_fd_alloc *alloc = CALLOC_STRUCT(llvmpipe_memory_fd_alloc);
alloc->mem_fd = -1;
alloc->dmabuf_fd = -1;
#ifdef HAVE_LINUX_UDMABUF_H
#if defined(HAVE_LIBDRM) && defined(HAVE_LINUX_UDMABUF_H)
if (dmabuf) {
off_t mmap_size = lseek(fd, 0, SEEK_END);
lseek(fd, 0, SEEK_SET);
@ -1278,7 +1278,7 @@ llvmpipe_free_memory_fd(struct pipe_screen *screen,
if (alloc->type == LLVMPIPE_MEMORY_FD_TYPE_OPAQUE) {
os_free_fd(alloc->data);
}
#ifdef HAVE_LINUX_UDMABUF_H
#if defined(HAVE_LIBDRM) && defined(HAVE_LINUX_UDMABUF_H)
else {
munmap(alloc->data, alloc->size);
if (alloc->dmabuf_fd >= 0)
@ -1450,7 +1450,7 @@ llvmpipe_resource_get_param(struct pipe_screen *screen,
return false;
}
#ifdef HAVE_LINUX_UDMABUF_H
#if defined(HAVE_LIBDRM) && defined(HAVE_LINUX_UDMABUF_H)
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)
{
@ -1511,7 +1511,7 @@ llvmpipe_init_screen_resource_funcs(struct pipe_screen *screen)
screen->import_memory_fd = llvmpipe_import_memory_fd;
screen->free_memory_fd = llvmpipe_free_memory_fd;
#endif
#ifdef HAVE_LINUX_UDMABUF_H
#if defined(HAVE_LIBDRM) && defined(HAVE_LINUX_UDMABUF_H)
screen->query_dmabuf_modifiers = llvmpipe_query_dmabuf_modifiers;
screen->is_dmabuf_modifier_supported = llvmpipe_is_dmabuf_modifier_supported;
screen->get_dmabuf_modifier_planes = llvmpipe_get_dmabuf_modifier_planes;