xf86-video-ati: Branch 'master'

[Dave Airlie]

 src/r600_exa.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 3c527d752d3cced219c6113acb932511b16e35fb
Author: Dave Airlie <airlied at redhat.com>
Date:   Tue Nov 24 15:11:12 2009 +1000

    r600: enable mixed pixmaps

diff --git a/src/r600_exa.c b/src/r600_exa.c
index ca1a1fa..4c63378 100644
--- a/src/r600_exa.c
+++ b/src/r600_exa.c
@@ -2575,9 +2575,9 @@ R600DrawInit(ScreenPtr pScreen)
 #ifdef EXA_HANDLES_PIXMAPS
     if (info->cs) {
 	info->accel_state->exa->flags |= EXA_HANDLES_PIXMAPS;
-//#ifdef EXA_MIXED_PIXMAPS
-//	info->accel_state->exa->flags |= EXA_MIXED_PIXMAPS;
-//#endif
+#ifdef EXA_MIXED_PIXMAPS
+	info->accel_state->exa->flags |= EXA_MIXED_PIXMAPS;
+#endif
     }
 #endif
 #endif