summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Deucher <alexdeucher@gmail.com>2010-02-26 15:01:28 -0500
committerAlex Deucher <alexdeucher@gmail.com>2010-02-26 15:01:28 -0500
commite76b90b399c3cc0f0998c0209300c46f97505498 (patch)
treeed2a782ba1d920d0d4743ce9a323b6083bad4c7c
parent2de0af5f5b806f9dbfdb1e9b6a5cf96d9433961d (diff)
rv740: disable dfs workaround for drm 1.32+
rv740 pipe setup was fixed in 2.6.33
-rw-r--r--src/r600_exa.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/r600_exa.c b/src/r600_exa.c
index 6fed720d..488291d1 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;