Mesa (master): i915g: use drm ioctl to get pci devid

[Daniel Vetter]

Module: Mesa
Branch: master
Commit: 0fbb64a52931ba5871aa2c5eb01b81d391f678d1
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0fbb64a52931ba5871aa2c5eb01b81d391f678d1

Author: Daniel Vetter <daniel.vetter at ffwll.ch>
Date:   Mon Mar 28 21:16:12 2011 +0200

i915g: use drm ioctl to get pci devid

Signed-off-by: Daniel Vetter <daniel.vetter at ffwll.ch>

---

 src/gallium/winsys/i915/drm/i915_drm_winsys.c |   26 +++++++-----------------
 1 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/src/gallium/winsys/i915/drm/i915_drm_winsys.c b/src/gallium/winsys/i915/drm/i915_drm_winsys.c
index 2c3b508..a2b61cd 100644
--- a/src/gallium/winsys/i915/drm/i915_drm_winsys.c
+++ b/src/gallium/winsys/i915/drm/i915_drm_winsys.c
@@ -15,24 +15,14 @@
 static void
 i915_drm_get_device_id(unsigned int *device_id)
 {
-   char path[512];
-   FILE *file;
-   void *shutup_gcc;
-
-   /*
-    * FIXME: Fix this up to use a drm ioctl or whatever.
-    */
-
-   snprintf(path, sizeof(path), "/sys/class/drm/card0/device/device");
-   file = fopen(path, "r");
-   if (!file) {
-      return;
-   }
-
-   shutup_gcc = fgets(path, sizeof(path), file);
-   (void) shutup_gcc;
-   sscanf(path, "%x", device_id);
-   fclose(file);
+   int ret;
+   struct drm_i915_getparam gp;
+
+   gp.param = I915_PARAM_CHIPSET_ID;
+   gp.value = (int *)devid;
+
+   ret = ioctl(fd, DRM_IOCTL_I915_GETPARAM, &gp, sizeof(gp));
+   assert(ret == 0);
 }
 
 static void