summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichel Daenzer <michel@daenzer.net>2004-08-30 04:31:50 +0000
committerMichel Daenzer <michel@daenzer.net>2004-08-30 04:31:50 +0000
commit1458ff8e985c56cf65365493a5ccae2617b45a8e (patch)
tree5dc6212f455d17646cc9a10eb1d07e277499f1d9
parent57e2f27757d8d9a62043ef724dcfc3b6e6a13291 (diff)
Hotfix for Eric Anholt's fix for bug #1156 : Clear theXORG-6_7_99_904
RADEON_NONSURF_AP0_SWP_16BPP bit for 4 bpp data, otherwise it breaks at depth 16.
-rw-r--r--src/radeon_render.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/radeon_render.c b/src/radeon_render.c
index f05c850..145b653 100644
--- a/src/radeon_render.c
+++ b/src/radeon_render.c
@@ -312,8 +312,9 @@ static Bool RADEONSetupRenderByteswap(ScrnInfoPtr pScrn, int tex_bytepp)
| RADEON_NONSURF_AP0_SWP_16BPP);
break;
case 4:
- OUTREG(RADEON_SURFACE_CNTL, info->ModeReg.surface_cntl
- | RADEON_NONSURF_AP0_SWP_32BPP);
+ OUTREG(RADEON_SURFACE_CNTL, (info->ModeReg.surface_cntl &
+ ~RADEON_NONSURF_AP0_SWP_16BPP)
+ | RADEON_NONSURF_AP0_SWP_32BPP);
break;
default:
xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "%s: Don't know what to do for "