summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob Bornecrantz <jakob@vmware.com>2009-08-28 12:32:04 +0200
committerJakob Bornecrantz <jakob@vmware.com>2009-08-28 12:36:42 +0200
commit6f0a1a842685a2b172187ece08113352c3765ce6 (patch)
treea39fa425106ba1c5b0b14f0499db5cda01053b04
parent205d344e2a2f0c9ea982b037ab68feab06cbebb1 (diff)
st/xorg: Pass dri driver name as driverName on screen
-rw-r--r--src/gallium/state_trackers/xorg/xorg_dri2.c7
-rw-r--r--src/gallium/winsys/drm/intel/xorg/intel_xorg.c2
-rw-r--r--src/gallium/winsys/drm/radeon/xorg/radeon_xorg.c2
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 3aea37a06f..c48fb30e7d 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 46a7971f60..28107f4b80 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 36824251f0..f2c6ee5f9a 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;