Mesa (master): st/xorg: Pass dri driver name as driverName on screen

[Jakob Bornecrantz]

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

Author: Jakob Bornecrantz <jakob at vmware.com>
Date:   Fri Aug 28 12:32:04 2009 +0200

st/xorg: Pass dri driver name as driverName on screen

---

 src/gallium/state_trackers/xorg/xorg_dri2.c      |    7 ++-----
 src/gallium/winsys/drm/intel/xorg/intel_xorg.c   |    2 +-
 src/gallium/winsys/drm/radeon/xorg/radeon_xorg.c |    2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/gallium/state_trackers/xorg/xorg_dri2.c b/src/gallium/state_trackers/xorg/xorg_dri2.c
index 3aea37a..c48fb30 100644
--- a/src/gallium/state_trackers/xorg/xorg_dri2.c
+++ b/src/gallium/state_trackers/xorg/xorg_dri2.c
@@ -279,11 +279,8 @@ driScreenInit(ScreenPtr pScreen)
 
     dri2info.version = 1;
     dri2info.fd = ms->fd;
-#if 0
-    dri2info.driverName = pScrn->name;
-#else
-    dri2info.driverName = "i915"; /* FIXME */
-#endif
+
+    dri2info.driverName = pScrn->driverName;
     dri2info.deviceName = "/dev/dri/card0"; /* FIXME */
 
     dri2info.CreateBuffers = driCreateBuffers;
diff --git a/src/gallium/winsys/drm/intel/xorg/intel_xorg.c b/src/gallium/winsys/drm/intel/xorg/intel_xorg.c
index 46a7971..28107f4 100644
--- a/src/gallium/winsys/drm/intel/xorg/intel_xorg.c
+++ b/src/gallium/winsys/drm/intel/xorg/intel_xorg.c
@@ -140,7 +140,7 @@ intel_xorg_pci_probe(DriverPtr driver,
 			       NULL, NULL, NULL, NULL, NULL);
     if (scrn != NULL) {
 	scrn->driverVersion = 1;
-	scrn->driverName = "modesetting";
+	scrn->driverName = "i915";
 	scrn->name = "modesetting";
 	scrn->Probe = NULL;
 
diff --git a/src/gallium/winsys/drm/radeon/xorg/radeon_xorg.c b/src/gallium/winsys/drm/radeon/xorg/radeon_xorg.c
index 3682425..f2c6ee5 100644
--- a/src/gallium/winsys/drm/radeon/xorg/radeon_xorg.c
+++ b/src/gallium/winsys/drm/radeon/xorg/radeon_xorg.c
@@ -141,7 +141,7 @@ radeon_xorg_pci_probe(DriverPtr driver,
 			       NULL, NULL, NULL, NULL, NULL);
     if (scrn != NULL) {
 	scrn->driverVersion = 1;
-	scrn->driverName = "modesetting";
+	scrn->driverName = "radeon";
 	scrn->name = "modesetting";
 	scrn->Probe = NULL;