xf86-video-ati: Branch 'master'

[Dave Airlie]

 src/radeon.h |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit d52882d8188830dd52fa112dadcf5ea7f3e5fd5e
Author: Dave Airlie <airlied at redhat.com>
Date:   Mon Dec 22 09:27:47 2008 +1000

    radeon: setup 3D engine even when no DRI.
    
    This should fix some missing font issues in EXA without DRI cases.

diff --git a/src/radeon.h b/src/radeon.h
index a67962c..9f0e55a 100644
--- a/src/radeon.h
+++ b/src/radeon.h
@@ -1329,8 +1329,9 @@ do {									\
 	case EXA_ENGINEMODE_3D:						\
 	    break;							\
 	}								\
-	if (flush && info->directRenderingEnabled) {			\
-	    RADEONCPFlushIndirect(pScrn, 1);                            \
+	if (flush) {							\
+	    if (info->directRenderingEnabled)				\
+	        RADEONCPFlushIndirect(pScrn, 1);                        \
 	    RADEONInit3DEngine(pScrn);                                  \
 	}                                                               \
         info->accel_state->engineMode = EXA_ENGINEMODE_3D;              \