KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

zink: unbreak dmabuf handling 

this does need kms handling to do literally anything.

Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12857>
This commit is contained in:
Mike Blumenkrantz 2021-09-14 13:01:59 -04:00
parent b0318216fa
commit cfe0bf5a4a
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/gallium/drivers/zink/zink_resource.c
View File

@ -916,7 +916,7 @@ zink_resource_get_handle(struct pipe_screen *pscreen,
struct winsys_handle *whandle,
unsigned usage)
{
if (whandle->type == WINSYS_HANDLE_TYPE_FD) {
if (whandle->type == WINSYS_HANDLE_TYPE_FD || whandle->type == WINSYS_HANDLE_TYPE_KMS) {
#ifdef ZINK_USE_DMABUF
struct zink_resource *res = zink_resource(tex);
struct zink_screen *screen = zink_screen(pscreen);
@ -935,6 +935,14 @@ zink_resource_get_handle(struct pipe_screen *pscreen,
VkResult result = VKSCR(GetMemoryFdKHR)(screen->dev, &fd_info, &fd);
if (result != VK_SUCCESS)
return false;
if (whandle->type == WINSYS_HANDLE_TYPE_KMS) {
uint32_t h;
if (drmPrimeFDToHandle(screen->drm_fd, fd, &h)) {
return false;
}
close(fd);
fd = h;
}
whandle->handle = fd;
uint64_t value;
zink_resource_get_param(pscreen, context, tex, 0, 0, 0, PIPE_RESOURCE_PARAM_MODIFIER, 0, &value);