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

[Michel Daenzer]

 src/radeon_display.c |    2 --
 src/radeon_dri.c     |    8 ++++++++
 src/radeon_driver.c  |    1 -
 src/radeon_modes.c   |    2 +-
 4 files changed, 9 insertions(+), 4 deletions(-)

New commits:
diff-tree ff38c2c9cf0c6acbdaf53b681ec721487cf411f8 (from 2dd0892817090709b2fb7ffba920595ada00fcad)
Author: Michel Dänzer <michel at tungstengraphics.com>
Date:   Sun Nov 19 17:11:46 2006 +0100

    radeon: Bug #8989: Fix page flipping artifacts with XAA.
    
    We still have to force-sync the pages on enabling page flipping with XAA as the
    second page may have been clobbered by the offscreen pixmap cache since they
    were last synced.

diff --git a/src/radeon_dri.c b/src/radeon_dri.c
index be8e74f..73f9844 100644
--- a/src/radeon_dri.c
+++ b/src/radeon_dri.c
@@ -1910,6 +1910,14 @@ static void RADEONEnablePageFlip(ScreenP
 	RADEONSAREAPrivPtr pSAREAPriv = DRIGetSAREAPrivate(pScreen);
 
 	pSAREAPriv->pfAllowPageFlip = 1;
+
+#ifdef USE_XAA
+	if (!info->useEXA) {
+	    BoxRec box = { .x1 = 0, .y1 = 0, .x2 = pScrn->virtualX - 1,
+			   .y2 = pScrn->virtualY - 1 };
+	    RADEONDRIRefreshArea(pScrn, 1, &box);
+	}
+#endif
     }
 #endif
 }
diff-tree 2dd0892817090709b2fb7ffba920595ada00fcad (from 8c1b9269aaac746989bdb9be02915722bcf6fec0)
Author: Michel Dänzer <michel at tungstengraphics.com>
Date:   Sun Nov 19 17:09:11 2006 +0100

    Fix compile warnings.

diff --git a/src/radeon_display.c b/src/radeon_display.c
index 6aa87d4..9c8a3db 100644
--- a/src/radeon_display.c
+++ b/src/radeon_display.c
@@ -925,7 +925,6 @@ void RADEONSetupConnectors(ScrnInfoPtr p
 {
     RADEONInfoPtr info       = RADEONPTR(pScrn);
     RADEONEntPtr pRADEONEnt  = RADEONEntPriv(pScrn);
-    unsigned char *RADEONMMIO = info->MMIO;
     const char *s;
     Bool ignore_edid = FALSE;
     int i = 0, second = 0, max_mt = 5;
@@ -1149,7 +1148,6 @@ static void RADEONQueryConnectedDisplays
     unsigned char *RADEONMMIO = info->MMIO;
     const char *s;
     Bool ignore_edid = FALSE;
-    int i = 0, second = 0, max_mt = 5;
 
     /* IgnoreEDID option is different from the NoDDCxx options used by DDC module
      * When IgnoreEDID is used, monitor detection will still use DDC
diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index e833c7f..f5a8421 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -6349,7 +6349,6 @@ static Bool RADEONInit(ScrnInfoPtr pScrn
 		       RADEONSavePtr save)
 {
     RADEONInfoPtr info = RADEONPTR(pScrn);
-    RADEONEntPtr pRADEONEnt = RADEONEntPriv(pScrn);
 
     if (info->IsSecondary) {
         return RADEONInit2(pScrn, NULL, mode, 2, save);
diff --git a/src/radeon_modes.c b/src/radeon_modes.c
index 132f088..cf8ab89 100644
--- a/src/radeon_modes.c
+++ b/src/radeon_modes.c
@@ -40,7 +40,7 @@
 #include <string.h>
 #include <stdio.h>
 
-#include "xf86str.h"
+#include "xf86.h"
 				/* Driver data structures */
 #include "radeon.h"
 #include "radeon_reg.h"