Mesa (master): targets/egl-static: fix nouveau and vmwgfx for Android

Chia-I Wu olv at kemper.freedesktop.org
Sat Aug 27 02:57:09 PDT 2011


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

Author: Chia-I Wu <olv at lunarg.com>
Date:   Fri Aug 26 11:30:47 2011 +0800

targets/egl-static: fix nouveau and vmwgfx for Android

drmVersion and driver specific ioctls are used to get the PCI ID from a
DRM fd.  Eexpand the mechanism to nouveau and vmwgfx, except that for
nouveau, only the vendor ID is needed, and for vmwgfx, always assume
SVGA II.

---

 src/gallium/targets/egl-static/egl.c |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/src/gallium/targets/egl-static/egl.c b/src/gallium/targets/egl-static/egl.c
index a7aee27..5a66e3c 100644
--- a/src/gallium/targets/egl-static/egl.c
+++ b/src/gallium/targets/egl-static/egl.c
@@ -167,6 +167,16 @@ drm_fd_get_pci_id(int fd, int *vendor_id, int *chip_id)
 	 *chip_id = -1;
       }
    }
+   else if (util_strcmp(version->name, "nouveau") == 0) {
+      *vendor_id = 0x10de;
+      /* not used */
+      *chip_id = 0;
+   }
+   else if (util_strcmp(version->name, "vmwgfx") == 0) {
+      *vendor_id = 0x15ad;
+      /* assume SVGA II */
+      *chip_id = 0x0405;
+   }
 
    drmFreeVersion(version);
 



More information about the mesa-commit mailing list