diff options
| author | Alex Deucher <agd5f@yahoo.com> | 2005-03-24 06:45:52 +0000 |
|---|---|---|
| committer | Alex Deucher <agd5f@yahoo.com> | 2005-03-24 06:45:52 +0000 |
| commit | 5be4bf9000bdf58584a10a6b8e285d0f173304fa (patch) | |
| tree | 0a381b6b148ccc1576947c599de6ebe0cc3e3db5 /src/radeon_accel.c | |
| parent | 34af3da80304a13b6407dcc0f4db54d6c8bb7a41 (diff) | |
- radeon PLL access errata workarounds (Benjamin Herrenschmidt, acked by
Hui Yu)
Diffstat (limited to 'src/radeon_accel.c')
| -rw-r--r-- | src/radeon_accel.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/radeon_accel.c b/src/radeon_accel.c index e2f479d3..355cf5c7 100644 --- a/src/radeon_accel.c +++ b/src/radeon_accel.c @@ -72,9 +72,9 @@ /* Driver data structures */ #include "radeon.h" +#include "radeon_reg.h" #include "radeon_macros.h" #include "radeon_probe.h" -#include "radeon_reg.h" #include "radeon_version.h" #ifdef XF86DRI #define _XF86DRI_SERVER_ @@ -196,7 +196,7 @@ void RADEONEngineReset(ScrnInfoPtr pScrn) RADEONEngineFlush(pScrn); clock_cntl_index = INREG(RADEON_CLOCK_CNTL_INDEX); - if (info->R300CGWorkaround) R300CGWorkaround(pScrn); + RADEONPllErrataAfterIndex(info); #if 0 /* taken care of by new PM code */ /* Some ASICs have bugs with dynamic-on feature, which are @@ -274,8 +274,8 @@ void RADEONEngineReset(ScrnInfoPtr pScrn) OUTREG(RADEON_RBBM_SOFT_RESET, rbbm_soft_reset); OUTREG(RADEON_CLOCK_CNTL_INDEX, clock_cntl_index); - OUTPLL(RADEON_MCLK_CNTL, mclk_cntl); - if (info->R300CGWorkaround) R300CGWorkaround(pScrn); + RADEONPllErrataAfterIndex(info); + OUTPLL(pScrn, RADEON_MCLK_CNTL, mclk_cntl); } /* Restore the acceleration hardware to its previous state */ |