Mesa (master): radeon-r300: Fix a bit of breakage.

[Corbin Simpson]

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

Author: Corbin Simpson <MostAwesomeDude at gmail.com>
Date:   Tue Apr 28 03:28:57 2009 -0700

radeon-r300: Fix a bit of breakage.

Not really sure why reordering the ioctls makes them work again.

---

 src/gallium/winsys/drm/radeon/core/radeon_r300.c   |   19 +++++++++----------
 .../winsys/drm/radeon/{dri2 => dri}/Makefile       |    0 
 .../winsys/drm/radeon/{dri2 => dri}/SConscript     |    0 
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/gallium/winsys/drm/radeon/core/radeon_r300.c b/src/gallium/winsys/drm/radeon/core/radeon_r300.c
index 293b6c2..3302d62 100644
--- a/src/gallium/winsys/drm/radeon/core/radeon_r300.c
+++ b/src/gallium/winsys/drm/radeon/core/radeon_r300.c
@@ -53,32 +53,31 @@ static void radeon_r300_flush_cs(struct radeon_cs* cs)
 static void do_ioctls(struct r300_winsys* winsys, int fd)
 {
     drm_radeon_getparam_t gp;
-    uint32_t target;
+    int target;
     int retval;
 
     /* XXX is this cast safe? */
     gp.value = (int*)⌖
 
-    /* First, get PCI ID */
-    gp.param = RADEON_PARAM_DEVICE_ID;
+    /* First, get the number of pixel pipes */
+    gp.param = RADEON_PARAM_NUM_GB_PIPES;
     retval = drmCommandWriteRead(fd, DRM_RADEON_GETPARAM, &gp, sizeof(gp));
     if (retval) {
-        fprintf(stderr, "%s: Failed to get PCI ID, error number %d",
+        fprintf(stderr, "%s: Failed to get GB pipe count, error number %d\n",
                 __FUNCTION__, retval);
         exit(1);
     }
-    winsys->pci_id = target;
+    winsys->gb_pipes = target;
 
-    /* Then, get the number of pixel pipes */
-    gp.param = RADEON_PARAM_NUM_GB_PIPES;
+    /* Then, get PCI ID */
+    gp.param = RADEON_PARAM_DEVICE_ID;
     retval = drmCommandWriteRead(fd, DRM_RADEON_GETPARAM, &gp, sizeof(gp));
     if (retval) {
-        fprintf(stderr, "%s: Failed to get GB pipe count, error number %d",
+        fprintf(stderr, "%s: Failed to get PCI ID, error number %d\n",
                 __FUNCTION__, retval);
         exit(1);
     }
-    winsys->gb_pipes = target;
-
+    winsys->pci_id = target;
 }
 
 struct r300_winsys*
diff --git a/src/gallium/winsys/drm/radeon/dri2/Makefile b/src/gallium/winsys/drm/radeon/dri/Makefile
similarity index 100%
rename from src/gallium/winsys/drm/radeon/dri2/Makefile
rename to src/gallium/winsys/drm/radeon/dri/Makefile
diff --git a/src/gallium/winsys/drm/radeon/dri2/SConscript b/src/gallium/winsys/drm/radeon/dri/SConscript
similarity index 100%
rename from src/gallium/winsys/drm/radeon/dri2/SConscript
rename to src/gallium/winsys/drm/radeon/dri/SConscript