forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

drm/radeon/kms: dynclks fixes

Browse source 
- 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>
This commit is contained in:
Alex Deucher 2010-02-05 00:55:32 -05:00 • committed by Dave Airlie
commit 6d7f2d8da1
3 changed files with 5 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
drivers/gpu/drm/radeon/radeon_asic.h
View file

@ -549,7 +549,7 @@ static struct radeon_asic r600_asic = {
.set_memory_clock = &radeon_atom_set_memory_clock, .set_memory_clock = &radeon_atom_set_memory_clock,
.get_pcie_lanes = NULL, .get_pcie_lanes = NULL,
.set_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, .set_surface_reg = r600_set_surface_reg,
.clear_surface_reg = r600_clear_surface_reg, .clear_surface_reg = r600_clear_surface_reg,
.bandwidth_update = &rv515_bandwidth_update, .bandwidth_update = &rv515_bandwidth_update,

10
drivers/gpu/drm/radeon/radeon_atombios.c
View file

@ -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); 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) uint32_t radeon_atom_get_engine_clock(struct radeon_device *rdev)
{ {
GET_ENGINE_CLOCK_PS_ALLOCATION args; GET_ENGINE_CLOCK_PS_ALLOCATION args;

6
drivers/gpu/drm/radeon/radeon_clocks.c
View file

@ -846,8 +846,10 @@ int radeon_static_clocks_init(struct drm_device *dev)
/* XXX make sure engine is idle */ /* XXX make sure engine is idle */
if (radeon_dynclks != -1) { if (radeon_dynclks != -1) {
if (radeon_dynclks) if (radeon_dynclks) {
radeon_set_clock_gating(rdev, 1); if (rdev->asic->set_clock_gating)
radeon_set_clock_gating(rdev, 1);
}
} }
radeon_apply_clock_quirks(rdev); radeon_apply_clock_quirks(rdev);
return 0; return 0;