xf86-video-ati: Branch 'master' - 2 commits

[Michel Dänzer]

 configure.ac           |    5 ++---
 src/r600_exa.c         |    3 +++
 src/radeon_exa_funcs.c |    5 +++++
 src/radeon_probe.h     |    3 +++
 4 files changed, 13 insertions(+), 3 deletions(-)

New commits:
commit c7d344f0ad255761d5ae30da59cf0a8b532dfc68
Author: Michel Dänzer <daenzer at vmware.com>
Date:   Fri Feb 27 17:05:01 2009 +0100

    EXA: Make sure Prepare/FinishAccess hooks can handle EXA_PREPARE_AUX* indices.
    
    And signal this to the EXA core using the new EXA_SUPPORTS_PREPARE_AUX flag.

diff --git a/src/r600_exa.c b/src/r600_exa.c
index 17c5567..de91111 100644
--- a/src/r600_exa.c
+++ b/src/r600_exa.c
@@ -4395,6 +4395,9 @@ R600DrawInit(ScreenPtr pScreen)
     info->accel_state->exa->DownloadFromScreen = R600DownloadFromScreen;
 
     info->accel_state->exa->flags = EXA_OFFSCREEN_PIXMAPS;
+#ifdef EXA_SUPPORTS_PREPARE_AUX
+    info->accel_state->exa->flags |= EXA_SUPPORTS_PREPARE_AUX;
+#endif
     info->accel_state->exa->pixmapOffsetAlign = 256;
     info->accel_state->exa->pixmapPitchAlign = 256;
 
diff --git a/src/radeon_exa.c b/src/radeon_exa.c
index c5943de..ae68146 100644
--- a/src/radeon_exa.c
+++ b/src/radeon_exa.c
@@ -222,7 +222,7 @@ int RADEONBiggerCrtcArea(PixmapPtr pPix)
 
 #if X_BYTE_ORDER == X_BIG_ENDIAN
 
-static unsigned long swapper_surfaces[3];
+static unsigned long swapper_surfaces[6];
 
 static Bool RADEONPrepareAccess(PixmapPtr pPix, int index)
 {
diff --git a/src/radeon_exa_funcs.c b/src/radeon_exa_funcs.c
index eb16036..59cb46f 100644
--- a/src/radeon_exa_funcs.c
+++ b/src/radeon_exa_funcs.c
@@ -479,6 +479,9 @@ Bool FUNC_NAME(RADEONDrawInit)(ScreenPtr pScreen)
 #endif /* X_BYTE_ORDER == X_BIG_ENDIAN */
 
     info->accel_state->exa->flags = EXA_OFFSCREEN_PIXMAPS;
+#ifdef EXA_SUPPORTS_PREPARE_AUX
+    info->accel_state->exa->flags |= EXA_SUPPORTS_PREPARE_AUX;
+#endif
     info->accel_state->exa->pixmapOffsetAlign = RADEON_BUFFER_ALIGN + 1;
     info->accel_state->exa->pixmapPitchAlign = 64;
 
commit f4d57105fc869e9318f447a1514f1b284a0a4ec0
Author: Michel Dänzer <daenzer at vmware.com>
Date:   Fri Feb 27 09:23:24 2009 +0100

    Revert "EXA: Adapt to EXA changes in xserver Git."
    
    This reverts commit de358736dc696559ba99c71cf5b2a97508201630.

diff --git a/configure.ac b/configure.ac
index 28207d6..b094a50 100644
--- a/configure.ac
+++ b/configure.ac
@@ -129,7 +129,7 @@ if test "x$EXA" = xyes; then
         AC_MSG_RESULT(yes)
 
         SAVE_CPPFLAGS="$CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $XORG_CFLAGS -DEXA_DRIVER_KNOWN_MAJOR=3"
+        CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
         AC_CHECK_HEADER(exa.h,
                        [have_exa_h="yes"], [have_exa_h="no"])
         CPPFLAGS="$SAVE_CPPFLAGS"
@@ -138,7 +138,7 @@ else
 fi 
 
 SAVE_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS $XORG_CFLAGS -DEXA_DRIVER_KNOWN_MAJOR=3"
+CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
 if test "x$have_exa_h" = xyes; then
         AC_MSG_CHECKING([whether EXA version is at least 2.0.0])
         AC_PREPROC_IFELSE([AC_LANG_PROGRAM([[
@@ -153,7 +153,6 @@ if test "x$have_exa_h" = xyes; then
 
         if test "x$USE_EXA" = xyes; then
                 AC_DEFINE(USE_EXA, 1, [Build support for Exa])
-                AC_DEFINE(EXA_DRIVER_KNOWN_MAJOR, 3, [Major version of EXA we know how to handle])
         fi
 fi
 
diff --git a/src/radeon_exa.c b/src/radeon_exa.c
index ae68146..c5943de 100644
--- a/src/radeon_exa.c
+++ b/src/radeon_exa.c
@@ -222,7 +222,7 @@ int RADEONBiggerCrtcArea(PixmapPtr pPix)
 
 #if X_BYTE_ORDER == X_BIG_ENDIAN
 
-static unsigned long swapper_surfaces[6];
+static unsigned long swapper_surfaces[3];
 
 static Bool RADEONPrepareAccess(PixmapPtr pPix, int index)
 {
diff --git a/src/radeon_exa_funcs.c b/src/radeon_exa_funcs.c
index dec0285..eb16036 100644
--- a/src/radeon_exa_funcs.c
+++ b/src/radeon_exa_funcs.c
@@ -56,6 +56,8 @@
 
 #include "radeon.h"
 
+#include "exa.h"
+
 static int
 FUNC_NAME(RADEONMarkSync)(ScreenPtr pScreen)
 {
diff --git a/src/radeon_probe.h b/src/radeon_probe.h
index 49044e3..f072b9c 100644
--- a/src/radeon_probe.h
+++ b/src/radeon_probe.h
@@ -43,6 +43,9 @@
 
 #include "xf86Crtc.h"
 
+#ifdef USE_EXA
+#include "exa.h"
+#endif
 #ifdef USE_XAA
 #include "xaa.h"
 #endif