diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2009-03-13 13:28:42 -0400 |
|---|---|---|
| committer | Alex Deucher <alexdeucher@gmail.com> | 2009-03-13 17:58:06 -0400 |
| commit | 176c1b43fc3ee48e87c134446754360b3683c24b (patch) | |
| tree | 90f37e35a6d4255d08c74ba41e9fe27b1a9347e6 /src/radeon_commonfuncs.c | |
| parent | d538a4508248adf2debaf0cc870a2d1c48abd986 (diff) | |
R6xx/R7xx: return in RADEONWaitForIdleMMIO() if accel is off
Don't wait for engine idle if we haven't initialized the engine.
Behavior should be consistent with versions of the driver prior
to accel support being added.
Should fix bug 20645
Diffstat (limited to 'src/radeon_commonfuncs.c')
| -rw-r--r-- | src/radeon_commonfuncs.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/radeon_commonfuncs.c b/src/radeon_commonfuncs.c index eabd87df..a9bc7d28 100644 --- a/src/radeon_commonfuncs.c +++ b/src/radeon_commonfuncs.c @@ -744,6 +744,9 @@ void FUNC_NAME(RADEONWaitForIdle)(ScrnInfoPtr pScrn) #endif if (info->ChipFamily >= CHIP_FAMILY_R600) { + if (!info->accelOn) + return; + /* Wait for the engine to go idle */ if (info->ChipFamily >= CHIP_FAMILY_RV770) R600WaitForFifoFunction(pScrn, 8); |