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

diff --git a/src/gallium/state_trackers/xorg/xorg_dri2.c b/src/gallium/state_trackers/xorg/xorg_dri2.c
index 3aea37a06fb8cfe2dd4652ce648d36b81ab619ee..c48fb30e7d57c56c3633c6d33131e2ab50a63c75 100644 (file)
--- 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 46a7971f60905e6e61346666755249afcfd111d8..28107f4b806d8522a43bb2df021aaf535a33a0f1 100644 (file)
--- 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 36824251f0cac96d09d8cae5bb41f7326c031e89..f2c6ee5f9a9afc2aa1905db4de4e3fcc8ad872b3 100644 (file)
--- 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;