xf86-video-ati: Branch 'master'

[Alex Deucher]

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

New commits:
commit e76b90b399c3cc0f0998c0209300c46f97505498
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Fri Feb 26 15:01:28 2010 -0500

    rv740: disable dfs workaround for drm 1.32+
    
    rv740 pipe setup was fixed in 2.6.33

diff --git a/src/r600_exa.c b/src/r600_exa.c
index 6fed720..488291d 100644
--- a/src/r600_exa.c
+++ b/src/r600_exa.c
@@ -2015,9 +2015,11 @@ R600DownloadFromScreen(PixmapPtr pSrc, int x, int y, int w, int h,
     drmBufPtr scratch;
     struct radeon_bo *bo = NULL;
 
-    /* RV740 seems to be particularly problematic with small xfers */
-    if ((info->ChipFamily == CHIP_FAMILY_RV740) && (w < 32 || h < 32))
-	return FALSE;
+    /* bad pipe setup in drm prior to 1.32 */
+    if (info->dri->pKernelDRMVersion->version_minor < 32) {
+	    if ((info->ChipFamily == CHIP_FAMILY_RV740) && (w < 32 || h < 32))
+		    return FALSE;
+    }
 
     if (src_pitch & 7)
 	return FALSE;