xf86-video-ati: Branch 'master'

[Matthieu Herrb]

 src/radeon_driver.c |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletion(-)

New commits:
diff-tree 4c61c0ee91a2ffeefce30972a584486f1df1d1ae (from 5337e7bd0069a3f2c4ab22b21a19471427ad3d81)
Author: Matthieu Herrb <matthieu at deville.herrb.com>
Date:   Tue May 29 21:35:35 2007 -0600

    Fix build without XF86DRI

diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 5eca577..25921ad 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -3799,15 +3799,23 @@ Bool RADEONScreenInit(int scrnIndex, Scr
     char*          s;
 #endif
 
+#ifdef XF86DRI
     xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG,
 		   "RADEONScreenInit %lx %ld %d\n",
 		   pScrn->memPhysBase, pScrn->fbOffset, info->frontOffset);
+#else
+    xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG,
+		   "RADEONScreenInit %lx %ld\n",
+		   pScrn->memPhysBase, pScrn->fbOffset);
+#endif
 
     info->accelOn      = FALSE;
 #ifdef USE_XAA
     info->accel        = NULL;
 #endif
+#ifdef XF86DRI
     pScrn->fbOffset    = info->frontOffset;
+#endif
     if (info->IsSecondary) pScrn->fbOffset = pScrn->videoRam * 1024;
     if (!RADEONMapMem(pScrn)) return FALSE;
 
@@ -3997,6 +4005,7 @@ Bool RADEONScreenInit(int scrnIndex, Scr
     /* Setup DRI after visuals have been established, but before fbScreenInit is
      * called.  fbScreenInit will eventually call the driver's InitGLXVisuals
      * call back. */
+#ifdef XF86DRI
     if (info->directRenderingEnabled) {
 	/* FIXME: When we move to dynamic allocation of back and depth
 	 * buffers, we will want to revisit the following check for 3
@@ -4020,7 +4029,6 @@ Bool RADEONScreenInit(int scrnIndex, Scr
 	}
     }
 
-#if defined(XF86DRI)
     /* Tell DRI about new memory map */
     if (info->directRenderingEnabled && info->newMemoryMap) {
         if (RADEONDRISetParam(pScrn, RADEON_SETPARAM_NEW_MEMMAP, 1) < 0) {