moonlight-stream/moonlight-qt
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-qt.git synced 2026-04-21 07:30:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix deadlock in Vulkan renderer using KMSDRM on AMDGPU

Browse Source
This commit is contained in:
Cameron Gutman
2026-04-19 21:16:22 -05:00
parent 0e50a9d457
commit d17575d47c
1 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/masterhook_internal.c
View File

@@ -39,12 +39,28 @@ int g_SdlDrmMasterFdCount = 0;
pthread_mutex_t g_FdTableLock = PTHREAD_MUTEX_INITIALIZER;
// This lock protects sections of code that must run uninterrupted with DRM master
pthread_mutex_t g_MasterLock = PTHREAD_MUTEX_INITIALIZER;
pthread_mutex_t g_MasterLock;
pthread_once_t g_MasterLockInit;
// Lock order: g_MasterLock -> g_FdTableLock
static void initializeMasterLock(void)
{
pthread_mutexattr_t attr;
// g_MasterLock must be a recursive mutex because we can't fully
// predict how SDL and Vulkan/GL driver code will behave. They may
// call functions that trigger reentrancy into our hooks again,
// which can deadlock if the caller already holds the master lock.
pthread_mutexattr_init(&attr);
pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
pthread_mutex_init(&g_MasterLock, &attr);
pthread_mutexattr_destroy(&attr);
}
void lockDrmMaster()
{
pthread_once(&g_MasterLockInit, initializeMasterLock);
pthread_mutex_lock(&g_MasterLock);
}