diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2010-06-30 12:13:55 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-08-02 09:59:57 +1000 |
| commit | 4ce9198ecf73739104b274c7c6377ef3659b3ca5 (patch) | |
| tree | aca62519a52541a8eb19d715d15390b0f4e1e67d /drivers/gpu/drm/radeon/r100.c | |
| parent | 37f9003bd355d9109769fff66f7f228aab42155b (diff) | |
| download | kernel_samsung_smdk4412-4ce9198ecf73739104b274c7c6377ef3659b3ca5.zip kernel_samsung_smdk4412-4ce9198ecf73739104b274c7c6377ef3659b3ca5.tar.gz kernel_samsung_smdk4412-4ce9198ecf73739104b274c7c6377ef3659b3ca5.tar.bz2 | |
drm/radeon/kms: minor driver cleanups
- Make the logic in r100_pll_errata_after_index() match the other
errata functions
- Use rdev->family rather than rdev->flags & RADEON_FAMILY_MASK for kms
- replace rn50 check using ids with ASIC_IS_RN50 convenience macro
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/r100.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/r100.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c index ab37717..5aa2995 100644 --- a/drivers/gpu/drm/radeon/r100.c +++ b/drivers/gpu/drm/radeon/r100.c @@ -2365,11 +2365,10 @@ void r100_mc_init(struct radeon_device *rdev) */ void r100_pll_errata_after_index(struct radeon_device *rdev) { - if (!(rdev->pll_errata & CHIP_ERRATA_PLL_DUMMYREADS)) { - return; + if (rdev->pll_errata & CHIP_ERRATA_PLL_DUMMYREADS) { + (void)RREG32(RADEON_CLOCK_CNTL_DATA); + (void)RREG32(RADEON_CRTC_GEN_CNTL); } - (void)RREG32(RADEON_CLOCK_CNTL_DATA); - (void)RREG32(RADEON_CRTC_GEN_CNTL); } static void r100_pll_errata_after_data(struct radeon_device *rdev) |