From 27240f0f2184c4f3534f3570b47566c5259bf689 Mon Sep 17 00:00:00 2001 From: Alex Deucher Date: Mon, 22 Mar 2010 13:24:51 -0400 Subject: [PATCH] drm/radeon/kms/pm: enable memory reclocking Signed-off-by: Alex Deucher --- drivers/gpu/drm/radeon/r100.c | 10 ++-------- drivers/gpu/drm/radeon/r600.c | 11 +++-------- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c index 8a2b521..56f3303 100644 --- a/drivers/gpu/drm/radeon/r100.c +++ b/drivers/gpu/drm/radeon/r100.c @@ -161,12 +161,6 @@ void r100_set_power_state(struct radeon_device *rdev) if (rdev->pm.active_crtc_count > 1) mclk = rdev->clock.default_mclk; - DRM_INFO("Setting: e: %d m: %d p: %d\n", - sclk, mclk, - rdev->pm.power_state[rdev->pm.requested_power_state_index]. - non_clock_info.pcie_lanes); - - /* set pcie lanes */ /* TODO */ @@ -180,9 +174,9 @@ void r100_set_power_state(struct radeon_device *rdev) if (sclk != rdev->pm.current_sclk) { radeon_set_engine_clock(rdev, sclk); rdev->pm.current_sclk = sclk; + DRM_INFO("Setting: e: %d\n", sclk); } -#if 0 /* set memory clock */ if (rdev->asic->set_memory_clock && (mclk != rdev->pm.current_mclk)) { radeon_sync_with_vblank(rdev); @@ -190,8 +184,8 @@ void r100_set_power_state(struct radeon_device *rdev) radeon_set_memory_clock(rdev, mclk); radeon_pm_debug_check_in_vbl(rdev, true); rdev->pm.current_mclk = mclk; + DRM_INFO("Setting: m: %d\n", mclk); } -#endif rdev->pm.current_power_state_index = rdev->pm.requested_power_state_index; rdev->pm.current_clock_mode_index = rdev->pm.requested_clock_mode_index; diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c index 2c4c742..7e1233f 100644 --- a/drivers/gpu/drm/radeon/r600.c +++ b/drivers/gpu/drm/radeon/r600.c @@ -251,12 +251,6 @@ void r600_set_power_state(struct radeon_device *rdev) if (rdev->pm.active_crtc_count > 1) mclk = rdev->clock.default_mclk; - DRM_INFO("Setting: e: %d m: %d p: %d\n", - sclk, mclk, - rdev->pm.power_state[rdev->pm.requested_power_state_index]. - non_clock_info.pcie_lanes); - - /* set pcie lanes */ /* TODO */ @@ -270,9 +264,9 @@ void r600_set_power_state(struct radeon_device *rdev) if (sclk != rdev->pm.current_sclk) { radeon_set_engine_clock(rdev, sclk); rdev->pm.current_sclk = sclk; + DRM_INFO("Setting: e: %d\n", sclk); } -#if 0 /* set memory clock */ if (rdev->asic->set_memory_clock && (mclk != rdev->pm.current_mclk)) { radeon_sync_with_vblank(rdev); @@ -280,8 +274,9 @@ void r600_set_power_state(struct radeon_device *rdev) radeon_set_memory_clock(rdev, mclk); radeon_pm_debug_check_in_vbl(rdev, true); rdev->pm.current_mclk = mclk; + DRM_INFO("Setting: m: %d\n", mclk); } -#endif + rdev->pm.current_power_state_index = rdev->pm.requested_power_state_index; rdev->pm.current_clock_mode_index = rdev->pm.requested_clock_mode_index; } else -- 1.5.6.3