openbsd/xenocara
1
0
Fork 0
mirror of https://github.com/openbsd/xenocara.git synced 2025-12-08 18:28:43 +00:00
Code Issues Projects Releases Wiki Activity

unbreak DRI3 support by using priv_open_device() to open the devices

Browse Source 
priv_open_device() has to be used in case the X server is running
privilege separated

ok kettenis@, jsg@, matthieu@
This commit is contained in:
robert
2020-12-21 09:06:14 +00:00
parent 6b555e934e
commit b9b78c90f9
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
driver/xf86-video-amdgpu/src/amdgpu_dri3.c
View File

@@ -41,6 +41,12 @@
#include <errno.h>
#include <libgen.h>
#ifdef X_PRIVSEP
extern int priv_open_device(const char *);
#else
#define priv_open_device(n) open(n,O_RDWR|O_CLOEXEC)
#endif
static int open_master_node(ScreenPtr screen, int *out)
{
ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
@@ -49,7 +55,7 @@ static int open_master_node(ScreenPtr screen, int *out)
drm_magic_t magic;
int fd;
fd = open(info->dri2.device_name, O_RDWR | O_CLOEXEC);
fd = priv_open_device(info->dri2.device_name);
if (fd < 0)
return BadAlloc;
@@ -93,7 +99,7 @@ static int open_render_node(ScreenPtr screen, int *out)
AMDGPUEntPtr pAMDGPUEnt = AMDGPUEntPriv(scrn);
int fd;
fd = open(pAMDGPUEnt->render_node, O_RDWR | O_CLOEXEC);
fd = priv_open_device(pAMDGPUEnt->render_node);
if (fd < 0)
return BadAlloc;

10
driver/xf86-video-ati/src/radeon_dri3.c
View File

@@ -41,6 +41,12 @@
#include <errno.h>
#include <libgen.h>
#ifdef X_PRIVSEP
extern int priv_open_device(const char *);
#else
#define priv_open_device(n) open(n,O_RDWR|O_CLOEXEC);
#endif
static int open_master_node(ScreenPtr screen, int *out)
{
ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
@@ -49,7 +55,7 @@ static int open_master_node(ScreenPtr screen, int *out)
drm_magic_t magic;
int fd;
fd = open(info->dri2.device_name, O_RDWR | O_CLOEXEC);
fd = priv_open_device(info->dri2.device_name);
if (fd < 0)
return BadAlloc;
@@ -93,7 +99,7 @@ static int open_render_node(ScreenPtr screen, int *out)
RADEONEntPtr pRADEONEnt = RADEONEntPriv(scrn);
int fd;
fd = open(pRADEONEnt->render_node, O_RDWR | O_CLOEXEC);
fd = priv_open_device(pRADEONEnt->render_node);
if (fd < 0)
return BadAlloc;