xf86-video-ati: Branch 'randr-1.2'

[Matthieu Herrb]

 src/radeon_crtc.c   |    4 +++-
 src/radeon_driver.c |   10 +++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

New commits:
diff-tree 800bf53279e2c2bf854682bbfd6fa16d03afed00 (from c2637a01f9aca4032262c66ade305f5fe2c54294)
Author: Matthieu Herrb <matthieu at deville.herrb.com>
Date:   Tue May 29 23:31:13 2007 -0600

    Fix build without XF86DRI

diff --git a/src/radeon_crtc.c b/src/radeon_crtc.c
index 070daaf..0e1d82e 100644
--- a/src/radeon_crtc.c
+++ b/src/radeon_crtc.c
@@ -239,9 +239,9 @@ radeon_crtc_lock(xf86CrtcPtr crtc)
 {
     ScrnInfoPtr		pScrn = crtc->scrn;
     RADEONInfoPtr  info = RADEONPTR(pScrn);
+#ifdef XF86DRI
     Bool           CPStarted   = info->CPStarted;
 
-#ifdef XF86DRI
     if (info->CPStarted && pScrn->pScreen) {
 	DRILock(pScrn->pScreen, 0);
 	if (info->accelOn)
@@ -365,8 +365,10 @@ radeon_crtc_shadow_allocate (xf86CrtcPtr
 		       "Couldn't allocate shadow memory for rotated CRTC\n");
 	    return NULL;
 	}
+#ifdef XF86DRI
 	rotate_offset = info->frontOffset +
 	    radeon_crtc->rotate_mem_xaa->offset * cpp;
+#endif
     }
 #endif /* USE_XAA */
 
diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index c57e13e..42d1899 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -3315,14 +3315,22 @@ Bool RADEONScreenInit(int scrnIndex, Scr
     char*          s;
 #endif
 
+
+#ifdef XF86DRI
     RADEONTRACE(("RADEONScreenInit %lx %ld %d\n",
 		 pScrn->memPhysBase, pScrn->fbOffset, info->frontOffset));
+#else
+    RADEONTRACE(("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 (!RADEONMapMem(pScrn)) return FALSE;
 
 #ifdef XF86DRI
@@ -3497,6 +3505,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
@@ -3520,7 +3529,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) {