xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/radeon_driver.c |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit fe87bdee815372b4b4d7d4c705e34681625b90f2
Author: Alex Deucher <alex at botch2.(none)>
Date:   Fri Feb 29 13:10:13 2008 -0500

    AVIVO: disable pageflipping on avivo chips until we have proper drm support

diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index c38e39b..1b3e800 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -2163,7 +2163,14 @@ static Bool RADEONPreInitDRI(ScrnInfoPtr pScrn)
     } else {
 	from = xf86GetOptValBool(info->Options, OPTION_PAGE_FLIP,
 				 &info->allowPageFlip) ? X_CONFIG : X_DEFAULT;
-	reason = "";
+
+	if (IS_AVIVO_VARIANT) {
+	    info->allowPageFlip = 0;
+	    reason = " on r5xx and newer chips.\n";
+	} else {
+	    reason = "";
+	}
+
     }
 #else
     from = X_DEFAULT;