summaryrefslogtreecommitdiff
path: root/src/radeon_accel.c
diff options
context:
space:
mode:
authorKevin E Martin <kem@kem.org>2004-08-12 05:00:22 +0000
committerKevin E Martin <kem@kem.org>2004-08-12 05:00:22 +0000
commit955f2b89f94aaa20b5eafd045b01e3eeef3d29ad (patch)
tree6a921cc5fc31e85500dd00d03852a3af6c0f3706 /src/radeon_accel.c
parent8f3ea53f26493a5f02410297a587d1d95c067094 (diff)
Fix context switching on Radeons and build problem when XF86DRI is notXORG-6_7_99_2
defined (Bug #922, Eric Anholt).
Diffstat (limited to 'src/radeon_accel.c')
-rw-r--r--src/radeon_accel.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/radeon_accel.c b/src/radeon_accel.c
index 0799033f..62ce8794 100644
--- a/src/radeon_accel.c
+++ b/src/radeon_accel.c
@@ -313,12 +313,11 @@ void RADEONEngineRestore(ScrnInfoPtr pScrn)
OUTREG(RADEON_DP_SRC_BKGD_CLR, 0x00000000);
OUTREG(RADEON_DP_WRITE_MASK, 0xffffffff);
+ RADEONWaitForIdleMMIO(pScrn);
+
#ifdef RENDER
- if (info->RenderAccel)
- RADEONInit3DEngineForRender(pScrn);
+ info->RenderInited3D = FALSE;
#endif
-
- RADEONWaitForIdleMMIO(pScrn);
}
/* Initialize the acceleration hardware */