ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-06-09 19:01:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

libdrm/lima: move sync fd handling into DRM object

Browse Source 
Converting from the sync-fd to the actual handle is internal
implementation detail.

Issue #4760.
This commit is contained in:
Josef Söntgen 2022-12-20 15:14:23 +00:00 committed by Christian Helmuth
parent 401da72a86
commit da32849ac2
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
repos/libports/src/lib/libdrm/ioctl_lima.cc
View File

@ -436,8 +436,14 @@ class Lima::Call
} while (true); } while (true);
} }
void _wait_for_syncobj(unsigned int handle) int _wait_for_syncobj(int fd)
{ {
if (fd < SYNC_FD) {
Genode::warning("ignore invalid sync fd: ", fd);
return -1;
}
unsigned const handle = fd - SYNC_FD;
Syncobj::Id_space::Id syncobj_id { .value = handle }; Syncobj::Id_space::Id syncobj_id { .value = handle };
try { try {
@ -453,7 +459,12 @@ class Lima::Call
} while (true); } while (true);
}; };
_syncobj_space.apply<Syncobj>(syncobj_id, wait); _syncobj_space.apply<Syncobj>(syncobj_id, wait);
} catch (Genode::Id_space<Lima::Call::Syncobj>::Unknown_id) { } } catch (Genode::Id_space<Lima::Call::Syncobj>::Unknown_id) {
Genode::warning("ignore unknown sync fd: ", fd);
return -1;
}
return 0;
} }
template <typename FN> template <typename FN>
@ -807,6 +818,11 @@ class Lima::Call
: _generic_ioctl(command_number(request), arg); : _generic_ioctl(command_number(request), arg);
} }
int wait_for_syncobj(int fd)
{
return _wait_for_syncobj(fd);
}
void *mmap(unsigned long offset, unsigned long /* size */) void *mmap(unsigned long offset, unsigned long /* size */)
{ {
/* /*
@ -907,8 +923,8 @@ int lima_drm_poll(int fd)
return -1; return -1;
} }
int const handle = fd - Lima::Call::SYNC_FD; int const ret = _drm->wait_for_syncobj(fd);
_drm->wait_for_syncobj((unsigned)handle);
pthread_mutex_unlock(&poll_mutex); pthread_mutex_unlock(&poll_mutex);
return 0; return ret;
} }