frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

introduce open_hw() function 

probe_hw opens the hardware in the order we want it:
first try devname, if this is NULL then try the KMSDEVICE
environment variable and as a last fallback use "/dev/dri/card0".
Instead of implementing the same code again when really opening
the device move the code to a open_hw() function and let probe_hw
use it.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Sascha Hauer 2012-03-03 14:09:24 +01:00 committed by Dave Airlie
parent aa6ceaaa84
commit 456a001e3f
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hw/xfree86/drivers/modesetting/driver.c
View File

@ -174,7 +174,7 @@ Identify(int flags)
Chipsets); Chipsets);
} }
static Bool probe_hw(char *dev) static int open_hw(char *dev)
{ {
int fd; int fd;
if (dev) if (dev)
@ -186,13 +186,20 @@ static Bool probe_hw(char *dev)
fd = open(dev,O_RDWR, 0); fd = open(dev,O_RDWR, 0);
} }
} }
if (fd == -1) { if (fd == -1)
xf86DrvMsg(-1, X_ERROR,"open %s: %s\n", dev, strerror(errno)); xf86DrvMsg(-1, X_ERROR,"open %s: %s\n", dev, strerror(errno));
return FALSE;
} return fd;
}
static Bool probe_hw(char *dev)
{
int fd = open_hw(dev);
if (fd != -1) {
close(fd); close(fd);
return TRUE; return TRUE;
}
return FALSE;
} }
static const OptionInfoRec * static const OptionInfoRec *