diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2009-02-03 10:44:10 -0500 |
|---|---|---|
| committer | Alex Deucher <alexdeucher@gmail.com> | 2009-02-03 10:44:10 -0500 |
| commit | d1f071c7f1dad6babfbcfcc2cb2b722a4987f372 (patch) | |
| tree | 8b1d683610782ab59c382c611f8df474c79da91a /src/radeon_commonfuncs.c | |
| parent | c88c3ef6f3db266c1aacba5297b8dfc8b66bf00e (diff) | |
Initial R6xx/R7xx EXA and textured video support
Diffstat (limited to 'src/radeon_commonfuncs.c')
| -rw-r--r-- | src/radeon_commonfuncs.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/radeon_commonfuncs.c b/src/radeon_commonfuncs.c index 0a9f9db9..7e00384e 100644 --- a/src/radeon_commonfuncs.c +++ b/src/radeon_commonfuncs.c @@ -733,8 +733,11 @@ void FUNC_NAME(RADEONWaitForIdle)(ScrnInfoPtr pScrn) xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Idle timed out, resetting engine...\n"); - RADEONEngineReset(pScrn); - RADEONEngineRestore(pScrn); + if (info->ChipFamily < CHIP_FAMILY_R600) { + RADEONEngineReset(pScrn); + RADEONEngineRestore(pScrn); + } else + R600EngineReset(pScrn); /* Always restart the engine when doing CP 2D acceleration */ RADEONCP_RESET(pScrn, info); @@ -751,7 +754,7 @@ void FUNC_NAME(RADEONWaitForIdle)(ScrnInfoPtr pScrn) #endif if (info->ChipFamily >= CHIP_FAMILY_R600) - return; + return; /* Wait for the engine to go idle */ RADEONWaitForFifoFunction(pScrn, 64); |