diff options
author | Alex Deucher <alexdeucher@gmail.com> | 2010-02-05 00:55:32 -0500 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2010-02-08 18:32:31 -0500 |
commit | 6d7f2d8da106ecf794a5a3e98c4239f348119e3c (patch) | |
tree | 93f72b1ee3c3532fde235517f71dbd1a87585bfb /drivers/gpu/drm/radeon/radeon_clocks.c | |
parent | a0eb38eb8637a81bb7770d34036e498d2ba63a26 (diff) |
drm/radeon/kms: dynclks fixes
- only r4xx/r5xx/rs6xx/rs740 have clock gating atom table,
so disable it on r6xx. it's already disabled on r7xx
- check to make sure the clock_gating hook exists before
calling it. This avoids a segfault on asics without
that function.
- remove unused static power management function.
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_clocks.c')
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_clocks.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_clocks.c b/drivers/gpu/drm/radeon/radeon_clocks.c index 73c4405bf42f..3ec94a0d3109 100644 --- a/drivers/gpu/drm/radeon/radeon_clocks.c +++ b/drivers/gpu/drm/radeon/radeon_clocks.c | |||
@@ -846,8 +846,10 @@ int radeon_static_clocks_init(struct drm_device *dev) | |||
846 | /* XXX make sure engine is idle */ | 846 | /* XXX make sure engine is idle */ |
847 | 847 | ||
848 | if (radeon_dynclks != -1) { | 848 | if (radeon_dynclks != -1) { |
849 | if (radeon_dynclks) | 849 | if (radeon_dynclks) { |
850 | radeon_set_clock_gating(rdev, 1); | 850 | if (rdev->asic->set_clock_gating) |
851 | radeon_set_clock_gating(rdev, 1); | ||
852 | } | ||
851 | } | 853 | } |
852 | radeon_apply_clock_quirks(rdev); | 854 | radeon_apply_clock_quirks(rdev); |
853 | return 0; | 855 | return 0; |