qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Open /dev/drm0 instead of /dev/dri/card0 and add privsep support.

Browse Source 
ok jsg@
This commit is contained in:
kettenis 2013-01-17 11:00:57 +00:00
parent c0a0ffd5bb
commit 2699efd7db
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
driver/xf86-video-modesetting/src/driver.c
View File

@ -62,6 +62,12 @@
#include "compat-api.h"
#include "driver.h"
#ifdef X_PRIVSEP
extern int priv_open_device(const char *);
#else
#define priv_open_device(n) open(n,O_RDWR|O_NONBLOCK|O_EXCL)
#endif
static void AdjustFrame(ADJUST_FRAME_ARGS_DECL);
static Bool CloseScreen(CLOSE_SCREEN_ARGS_DECL);
static Bool EnterVT(VT_FUNC_ARGS_DECL);
@ -187,12 +193,12 @@ static int open_hw(char *dev)
{
int fd;
if (dev)
fd = open(dev, O_RDWR, 0);
fd = priv_open_device(dev);
else {
dev = getenv("KMSDEVICE");
if ((NULL == dev) || ((fd = open(dev, O_RDWR, 0)) == -1)) {
dev = "/dev/dri/card0";
fd = open(dev,O_RDWR, 0);
if ((NULL == dev) || ((fd = priv_open_device(dev)) == -1)) {
dev = "/dev/drm0";
fd = priv_open_device(dev);
}
}
if (fd == -1)