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>

diff --git a/drivers/gpu/drm/radeon/radeon_asic.h b/drivers/gpu/drm/radeon/radeon_asic.h
index d758b1ffb74cf74caa7ba8201ca2c464c80e941b..3f3c7a2169f18a962f1848ccf16f0562a22046fc 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_asic.h
+++ b/drivers/gpu/drm/radeon/radeon_asic.h
@@ -549,7 +549,7 @@ static struct radeon_asic r600_asic = {
        .set_memory_clock = &radeon_atom_set_memory_clock,
        .get_pcie_lanes = NULL,
        .set_pcie_lanes = NULL,
-       .set_clock_gating = &radeon_atom_set_clock_gating,
+       .set_clock_gating = NULL,
        .set_surface_reg = r600_set_surface_reg,
        .clear_surface_reg = r600_clear_surface_reg,
        .bandwidth_update = &rv515_bandwidth_update,

diff --git a/drivers/gpu/drm/radeon/radeon_atombios.c b/drivers/gpu/drm/radeon/radeon_atombios.c
index b55012fedb94d92f2489d02ac0cbf59ff6203ab3..c3198453528fc2d82c917a58fb65ff11c7b0f2ed 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_atombios.c
+++ b/drivers/gpu/drm/radeon/radeon_atombios.c
@@ -1780,16 +1780,6 @@ void radeon_atom_set_clock_gating(struct radeon_device *rdev, int enable)
        atom_execute_table(rdev->mode_info.atom_context, index, (uint32_t *)&args);
 }
 
-void radeon_atom_static_pwrmgt_setup(struct radeon_device *rdev, int enable)
-{
-       ENABLE_ASIC_STATIC_PWR_MGT_PS_ALLOCATION args;
-       int index = GetIndexIntoMasterTable(COMMAND, EnableASIC_StaticPwrMgt);
-
-       args.ucEnable = enable;
-
-       atom_execute_table(rdev->mode_info.atom_context, index, (uint32_t *)&args);
-}
-
 uint32_t radeon_atom_get_engine_clock(struct radeon_device *rdev)
 {
        GET_ENGINE_CLOCK_PS_ALLOCATION args;

diff --git a/drivers/gpu/drm/radeon/radeon_clocks.c b/drivers/gpu/drm/radeon/radeon_clocks.c
index 73c4405bf42f7af190119166a4404d8f6d31075a..3ec94a0d3109da5ad37fa086fe0ac484a0756133 100644 (file)
--- 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)
        /* XXX make sure engine is idle */
 
        if (radeon_dynclks != -1) {
-               if (radeon_dynclks)
-                       radeon_set_clock_gating(rdev, 1);
+               if (radeon_dynclks) {
+                       if (rdev->asic->set_clock_gating)
+                               radeon_set_clock_gating(rdev, 1);
+               }
        }
        radeon_apply_clock_quirks(rdev);
        return 0;