diff options
author | Alex Deucher <alexdeucher@gmail.com> | 2010-06-30 12:13:55 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2010-08-01 19:59:57 -0400 |
commit | 4ce9198ecf73739104b274c7c6377ef3659b3ca5 (patch) | |
tree | aca62519a52541a8eb19d715d15390b0f4e1e67d /drivers/gpu/drm/radeon/r100.c | |
parent | 37f9003bd355d9109769fff66f7f228aab42155b (diff) |
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 ab37717a5d39..5aa299527317 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) | |||
2365 | */ | 2365 | */ |
2366 | void r100_pll_errata_after_index(struct radeon_device *rdev) | 2366 | void r100_pll_errata_after_index(struct radeon_device *rdev) |
2367 | { | 2367 | { |
2368 | if (!(rdev->pll_errata & CHIP_ERRATA_PLL_DUMMYREADS)) { | 2368 | if (rdev->pll_errata & CHIP_ERRATA_PLL_DUMMYREADS) { |
2369 | return; | 2369 | (void)RREG32(RADEON_CLOCK_CNTL_DATA); |
2370 | (void)RREG32(RADEON_CRTC_GEN_CNTL); | ||
2370 | } | 2371 | } |
2371 | (void)RREG32(RADEON_CLOCK_CNTL_DATA); | ||
2372 | (void)RREG32(RADEON_CRTC_GEN_CNTL); | ||
2373 | } | 2372 | } |
2374 | 2373 | ||
2375 | static void r100_pll_errata_after_data(struct radeon_device *rdev) | 2374 | static void r100_pll_errata_after_data(struct radeon_device *rdev) |