Aurelien
/
xf86-video-intel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

intel: Fix fallout from accident push of ODEV_ATTRIB_FD 

This is WIP for passing along a hosted fd. It wasn't meant to be pushed
along with the bug fix this morning.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2013-10-03 13:36:46 +01:00
parent adbf01306a
commit b7d5292e01
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/intel_device.c
View File

@ -220,17 +220,23 @@ static char *find_render_node(int fd)
return NULL;
}
#ifdef XSERVER_PLATFORM_BUS
#define ODEV_ATTRIB_PATH 0
#define ODEV_ATTRIB_FD 4
#if defined(ODEV_ATTRIB_PATH)
static char *get_path(struct xf86_platform_device *dev)
{
const char *path = xf86_get_platform_device_attrib(dev, ODEV_ATTRIB_PATH);
return path ? strdup(path) : NULL;
}
#else
static char *get_path(struct xf86_platform_device *dev)
{
return NULL;
}
#endif
#if defined(ODEV_ATTRIB_FD) && 0
static int get_fd(struct xf86_platform_device *dev)
{
const char *str = xf86_get_platform_device_attrib(dev, ODEV_ATTRIB_FD);
@ -241,11 +247,6 @@ static int get_fd(struct xf86_platform_device *dev)
#else
static char *get_path(struct xf86_platform_device *dev)
{
return NULL;
}
static int get_fd(struct xf86_platform_device *dev)
{
return -1;