commit f07865e867bf6c3de01b8ea3570540e9cd6933c3
author Chia-I Wu <olvaffe@gmail.com> Mon Sep 15 13:52:21 2014 +0800
committer Chia-I Wu <olvaffe@gmail.com> Mon Sep 15 14:44:06 2014 +0800
tree 0b486177c44eb590ed73a6c83cb055ab24b8a005
parent 023ef68c3ce46e1b0c1cb1af869cb5330909d075

intel: prepare for primary node support

We will be able to support primary nodes once we know how to talk to an X
server.

icd/intel/dev.c

diff --git a/icd/intel/dev.c b/icd/intel/dev.c
index 428c90c..410832a 100644
--- a/icd/intel/dev.c
+++ b/icd/intel/dev.c
@@ -76,7 +76,7 @@
     if (info->extensionCount)
         return XGL_ERROR_INVALID_EXTENSION;
 
-    if (gpu->fd >= 0)
+    if (gpu->device_fd >= 0)
         return XGL_ERROR_DEVICE_ALREADY_CREATED;
 
     dev = (struct intel_dev *) intel_base_create(NULL, sizeof(*dev),
@@ -93,10 +93,10 @@
         return ret;
     }
 
-    dev->winsys = intel_winsys_create_for_fd(gpu->fd);
+    dev->winsys = intel_winsys_create_for_fd(gpu->device_fd);
     if (!dev->winsys) {
         icd_log(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, XGL_NULL_HANDLE,
-                0, 0, "failed to create device winsys for %s", gpu->path);
+                0, 0, "failed to create device winsys");
         intel_dev_destroy(dev);
         return XGL_ERROR_UNKNOWN;
     }
@@ -153,7 +153,7 @@
     if (dev->winsys)
         intel_winsys_destroy(dev->winsys);
 
-    if (dev->gpu->fd >= 0)
+    if (dev->gpu->device_fd >= 0)
         intel_gpu_close(dev->gpu);
 
     intel_base_destroy(&dev->base);