fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 00:38:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

freedreno: add DRM_CONF_SHARE_FD

Browse source 
And config query and DRM_CONF_SHARE_FD to both mega-driver and
traditional build configs, so that EGL_EXT_image_dma_buf_import
works.

Signed-off-by: Rob Clark <robclark@freedesktop.org>
(cherry picked from commit 18291ee17a)
This commit is contained in:
Rob Clark 2014-09-16 19:10:23 -04:00 • committed by Emil Velikov
parent 3a64feedb8
commit 2a90f0fb85
3 changed files with 34 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gallium/auxiliary/target-helpers/inline_drm_helper.h
View file

@ -465,7 +465,7 @@ dd_configuration(enum drm_conf conf)
#endif #endif
#if defined(GALLIUM_FREEDRENO) #if defined(GALLIUM_FREEDRENO)
if ((strcmp(driver_name, "kgsl") == 0) || (strcmp(driver_name, "msm") == 0)) if ((strcmp(driver_name, "kgsl") == 0) || (strcmp(driver_name, "msm") == 0))
return NULL; return configuration_query(conf);
else else
#endif #endif
return NULL; return NULL;

11
src/gallium/drivers/freedreno/freedreno_screen.c
View file

@ -390,6 +390,8 @@ fd_screen_bo_get_handle(struct pipe_screen *pscreen,
} else if (whandle->type == DRM_API_HANDLE_TYPE_KMS) { } else if (whandle->type == DRM_API_HANDLE_TYPE_KMS) {
whandle->handle = fd_bo_handle(bo); whandle->handle = fd_bo_handle(bo);
return TRUE; return TRUE;
} else if (whandle->type == DRM_API_HANDLE_TYPE_FD) {
whandle->handle = fd_bo_dmabuf(bo);
} else { } else {
return FALSE; return FALSE;
} }
@ -403,12 +405,17 @@ fd_screen_bo_from_handle(struct pipe_screen *pscreen,
struct fd_screen *screen = fd_screen(pscreen); struct fd_screen *screen = fd_screen(pscreen);
struct fd_bo *bo; struct fd_bo *bo;
if (whandle->type != DRM_API_HANDLE_TYPE_SHARED) { if (whandle->type == DRM_API_HANDLE_TYPE_SHARED) {
bo = fd_bo_from_name(screen->dev, whandle->handle);
} else if (whandle->type == DRM_API_HANDLE_TYPE_KMS) {
bo = fd_bo_from_handle(screen->dev, whandle->handle, 0);
} else if (whandle->type == DRM_API_HANDLE_TYPE_FD) {
bo = fd_bo_from_dmabuf(screen->dev, whandle->handle);
} else {
DBG("Attempt to import unsupported handle type %d", whandle->type); DBG("Attempt to import unsupported handle type %d", whandle->type);
return NULL; return NULL;
} }
bo = fd_bo_from_name(screen->dev, whandle->handle);
if (!bo) { if (!bo) {
DBG("ref name 0x%08x failed", whandle->handle); DBG("ref name 0x%08x failed", whandle->handle);
return NULL; return NULL;

25
src/gallium/targets/pipe-loader/pipe_msm.c
View file

@ -17,5 +17,28 @@ create_screen(int fd)
return screen; return screen;
} }
static const struct drm_conf_ret throttle_ret = {
.type = DRM_CONF_INT,
.val.val_int = 2,
};
static const struct drm_conf_ret share_fd_ret = {
.type = DRM_CONF_BOOL,
.val.val_int = true,
};
static const struct drm_conf_ret *drm_configuration(enum drm_conf conf)
{
switch (conf) {
case DRM_CONF_THROTTLE:
return &throttle_ret;
case DRM_CONF_SHARE_FD:
return &share_fd_ret;
default:
break;
}
return NULL;
}
PUBLIC PUBLIC
DRM_DRIVER_DESCRIPTOR("msm", "freedreno", create_screen, NULL) DRM_DRIVER_DESCRIPTOR("msm", "freedreno", create_screen, drm_configuration)