Index: radeon.h
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon.h,v
retrieving revision 1.17
diff -u -r1.17 radeon.h
--- radeon.h	26 Jan 2005 18:23:40 -0000	1.17
+++ radeon.h	18 Feb 2005 22:46:05 -0000
@@ -94,6 +94,8 @@
 #define RADEON_TIMEOUT    2000000 /* Fall out of wait loops after this count */
 #define RADEON_MMIOSIZE   0x80000
 
+/* Buffer are aligned on 4096 byte boundaries */
+#define RADEON_BUFFER_ALIGN 0x00000fff
 #define RADEON_VBIOS_SIZE 0x00010000
 #define RADEON_USE_RMX 0x80000000 /* mode flag for using RMX
 				   * Need to comfirm this is not used
@@ -428,6 +430,7 @@
     DGAFunctionRec    DGAFuncs;
 
     RADEONFBLayout    CurrentLayout;
+    CARD32            dst_pitch_offset;
 #ifdef XF86DRI
     Bool              noBackBuffer;
     Bool              directRenderingEnabled;
@@ -524,8 +527,6 @@
     CARD32            backPitchOffset;
     CARD32            depthPitchOffset;
 
-    CARD32            dst_pitch_offset;
-
 				/* offscreen memory management */
     int               backLines;
     FBAreaPtr         backArea;
Index: radeon_dri.h
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_dri.h,v
retrieving revision 1.4
diff -u -r1.4 radeon_dri.h
--- radeon_dri.h	12 Dec 2004 02:00:48 -0000	1.4
+++ radeon_dri.h	18 Feb 2005 22:46:05 -0000
@@ -58,9 +58,6 @@
 
 #define RADEON_CARD_TYPE_RADEON       1
 
-/* Buffer are aligned on 4096 byte boundaries */
-#define RADEON_BUFFER_ALIGN           0x00000fff
-
 #define RADEONCP_USE_RING_BUFFER(m)					\
     (((m) == RADEON_CSQ_PRIBM_INDDIS) ||				\
      ((m) == RADEON_CSQ_PRIBM_INDBM))
Index: radeon_driver.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c,v
retrieving revision 1.42
diff -u -r1.42 radeon_driver.c
--- radeon_driver.c	18 Feb 2005 19:55:35 -0000	1.42
+++ radeon_driver.c	18 Feb 2005 22:46:12 -0000
@@ -4998,7 +4998,6 @@
 	    info->directRenderingEnabled = RADEONDRIScreenInit(pScreen);
 	}
     }
-#endif
 
     /* Depth moves are disabled by default since they are extremely slow */
     info->depthMoves = xf86ReturnOptValBool(info->Options,
@@ -5013,6 +5012,7 @@
 	xf86DrvMsg(pScrn->scrnIndex, X_INFO,
 		   "Depth moves disabled by default\n");
     }
+#endif
 
     RADEONSetFBLocation(pScrn);
 
@@ -7872,7 +7872,10 @@
     }
     crtcoffsetcntl = INREG(regcntl) & ~0xf;
     /* try to get rid of flickering when scrolling at least for 2d */
-    if (!info->have3DWindows) crtcoffsetcntl &= ~RADEON_CRTC_OFFSET_FLIP_CNTL;
+#ifdef XF86DRI
+    if (!info->have3DWindows)
+#endif
+    crtcoffsetcntl &= ~RADEON_CRTC_OFFSET_FLIP_CNTL;
     if (info->tilingEnabled) {
 	int byteshift = info->CurrentLayout.bitsPerPixel >> 4;
 	/* crtc uses 256(bytes)x8 "half-tile" start addresses? */