Mirrors/moonlight-qt
2
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-qt synced 2024-12-15 05:42:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make drmDropMaster() more reliable by checking for DRM master fds.

Browse source 
This should fix the majority of EACCES permission denied errors
when attempting to drop the DRM master.
This commit is contained in:
Adam Lantos 2022-06-09 00:23:27 -07:00 committed by Cameron Gutman
parent 1b96b18bc0
commit 685136d98f
1 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
app/masterhook.c
View file

@ -35,14 +35,23 @@ struct stat64 g_DrmMasterStat;
// The DRM master FD created for SDL // The DRM master FD created for SDL
int g_SdlDrmMasterFd = -1; int g_SdlDrmMasterFd = -1;
int drmIsMaster(int fd)
{
/* Detect master by attempting something that requires master.
* This method is available in Mesa DRM since Feb 2019.
*/
return drmAuthMagic(fd, 0) != -EACCES;
}
// This hook will handle legacy DRM rendering // This hook will handle legacy DRM rendering
int drmModeSetCrtc(int fd, uint32_t crtcId, uint32_t bufferId, int drmModeSetCrtc(int fd, uint32_t crtcId, uint32_t bufferId,
uint32_t x, uint32_t y, uint32_t *connectors, int count, uint32_t x, uint32_t y, uint32_t *connectors, int count,
drmModeModeInfoPtr mode) drmModeModeInfoPtr mode)
{ {
// Grab the first DRM FD that makes it in here. This will be the Qt // Grab the first DRM Master FD that makes it in here. This will be the Qt
// EGLFS backend's DRM FD, which we will need later. // EGLFS backend's DRM FD, on which we will call drmDropMaster() later.
if (g_QtDrmMasterFd == -1) { if (g_QtDrmMasterFd == -1 && drmIsMaster(fd)) {
g_QtDrmMasterFd = fd; g_QtDrmMasterFd = fd;
fstat64(g_QtDrmMasterFd, &g_DrmMasterStat); fstat64(g_QtDrmMasterFd, &g_DrmMasterStat);
SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION, SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
@ -58,9 +67,9 @@ int drmModeSetCrtc(int fd, uint32_t crtcId, uint32_t bufferId,
int drmModeAtomicCommit(int fd, drmModeAtomicReqPtr req, int drmModeAtomicCommit(int fd, drmModeAtomicReqPtr req,
uint32_t flags, void *user_data) uint32_t flags, void *user_data)
{ {
// Grab the first DRM FD that makes it in here. This will be the Qt // Grab the first DRM Master FD that makes it in here. This will be the Qt
// EGLFS backend's DRM FD, which we will need later. // EGLFS backend's DRM FD, on which we will call drmDropMaster() later.
if (g_QtDrmMasterFd == -1) { if (g_QtDrmMasterFd == -1 && drmIsMaster(fd)) {
g_QtDrmMasterFd = fd; g_QtDrmMasterFd = fd;
fstat64(g_QtDrmMasterFd, &g_DrmMasterStat); fstat64(g_QtDrmMasterFd, &g_DrmMasterStat);
SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION, SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,