diff options
| author | Dave Airlie <airlied@linux.ie> | 2007-01-04 10:39:01 +1100 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2007-01-04 10:39:22 +1100 |
| commit | c54a31565e3ea50f1af7b81b1bf0c0e437099f47 (patch) | |
| tree | f9608e3a01e8e5ffe870f1a9a769e0d2693aab2e /src | |
| parent | dda2bbfdc2e0da6e8b9cb8d1bf78b91f1bb8131f (diff) | |
radeon: fixup fastwrites to be always off
My 8500 in i845 doesn't work with fastwrites even setup by the firmware.
Diffstat (limited to 'src')
| -rw-r--r-- | src/radeon_dri.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/radeon_dri.c b/src/radeon_dri.c index 35e41545..39c72dbe 100644 --- a/src/radeon_dri.c +++ b/src/radeon_dri.c @@ -739,8 +739,9 @@ static Bool RADEONSetAgpMode(RADEONInfoPtr info, ScreenPtr pScreen) from = X_DEFAULT; if (xf86GetOptValInteger(info->Options, OPTION_AGP_MODE, &info->agpMode)) { - if (info->agpMode < is_v3 ? 4 : 1 || info->agpMode > is_v3 ? 8 : 4 || - info->agpMode & (info->agpMode - 1)) { + if ((info->agpMode < (is_v3 ? 4 : 1)) || + (info->agpMode > (is_v3 ? 8 : 4)) || + (info->agpMode & (info->agpMode - 1))) { xf86DrvMsg(pScreen->myNum, X_ERROR, "Illegal AGP Mode: %d (valid values: %s), leaving at " "%dx\n", info->agpMode, is_v3 ? "4, 8" : "1, 2, 4", @@ -753,7 +754,7 @@ static Bool RADEONSetAgpMode(RADEONInfoPtr info, ScreenPtr pScreen) xf86DrvMsg(pScreen->myNum, from, "Using AGP %dx\n", info->agpMode); - info->agpFastWrite = (agp_status & RADEON_AGP_FW_MODE); + info->agpFastWrite = 0; // Always off by default as it sucks from = xf86GetOptValInteger(info->Options, OPTION_AGP_FW, &info->agpFastWrite) ? X_CONFIG : X_DEFAULT; @@ -794,6 +795,7 @@ static Bool RADEONSetAgpMode(RADEONInfoPtr info, ScreenPtr pScreen) } if (info->agpFastWrite) mode |= RADEON_AGP_FW_MODE; + else mode &= ~RADEON_AGP_FW_MODE; xf86DrvMsg(pScreen->myNum, X_INFO, "[agp] Mode 0x%08lx [AGP 0x%04x/0x%04x; Card 0x%04x/0x%04x]\n", |