xf86-video-intel: src/intel_device.c

[Chris Wilson]

 src/intel_device.c |   21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

New commits:
commit b7d5292e01fb43d93c13c60a3cef16d352307bdf
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu Oct 3 13:36:46 2013 +0100

    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 at chris-wilson.co.uk>

diff --git a/src/intel_device.c b/src/intel_device.c
index 450e6f5..c41179a 100644
--- a/src/intel_device.c
+++ b/src/intel_device.c
@@ -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;