[51/53] drm/radeon/dpm: implement UVD powergating for CI

Commit Message

Alex Deucher Aug. 12, 2013, 4:43 p.m. UTC

Disable the UVD block when not in use to save power.
The block is not actually powergated on CI, but we
switch between UVD DPM (where the uvd clocks are
adjusted on demand) and clocks off.

Signed-off-by: Alex Deucher <[e-mail]>
---
 drivers/gpu/drm/radeon/ci_dpm.c      | 7 +------
 drivers/gpu/drm/radeon/radeon_asic.c | 1 +
 drivers/gpu/drm/radeon/radeon_asic.h | 1 +
 3 files changed, 3 insertions(+), 6 deletions(-)

Patch

diff --git a/drivers/gpu/drm/radeon/ci_dpm.c b/drivers/gpu/drm/radeon/ci_dpm.c
index 6e3d387..e4d9d50 100644
--- a/drivers/gpu/drm/radeon/ci_dpm.c
+++ b/drivers/gpu/drm/radeon/ci_dpm.c
@@ -677,7 +677,7 @@  static int ci_power_control_set_level(struct radeon_device *rdev)
 	return ret;
 }
 
-static void ci_dpm_powergate_uvd(struct radeon_device *rdev, bool gate)
+void ci_dpm_powergate_uvd(struct radeon_device *rdev, bool gate)
 {
 	ci_update_uvd_dpm(rdev, gate);
 }
@@ -4674,11 +4674,6 @@  int ci_dpm_set_power_state(struct radeon_device *rdev)
 		return ret;
 	}
 #endif
-	ret = ci_update_uvd_dpm(rdev, false);
-	if (ret) {
-		DRM_ERROR("ci_update_uvd_dpm failed\n");
-		return ret;
-	}
 	ret = ci_update_sclk_t(rdev);
 	if (ret) {
 		DRM_ERROR("ci_update_sclk_t failed\n");
diff --git a/drivers/gpu/drm/radeon/radeon_asic.c b/drivers/gpu/drm/radeon/radeon_asic.c
index 63b6aae..61c0644 100644
--- a/drivers/gpu/drm/radeon/radeon_asic.c
+++ b/drivers/gpu/drm/radeon/radeon_asic.c
@@ -2470,6 +2470,7 @@  static struct radeon_asic ci_asic = {
 		.debugfs_print_current_performance_level = &ci_dpm_debugfs_print_current_performance_level,
 		.force_performance_level = &ci_dpm_force_performance_level,
 		.vblank_too_short = &ci_dpm_vblank_too_short,
+		.powergate_uvd = &ci_dpm_powergate_uvd,
 	},
 	.pflip = {
 		.pre_page_flip = &evergreen_pre_page_flip,
diff --git a/drivers/gpu/drm/radeon/radeon_asic.h b/drivers/gpu/drm/radeon/radeon_asic.h
index 9060757..5630291 100644
--- a/drivers/gpu/drm/radeon/radeon_asic.h
+++ b/drivers/gpu/drm/radeon/radeon_asic.h
@@ -766,6 +766,7 @@  void ci_dpm_debugfs_print_current_performance_level(struct radeon_device *rdev,
 int ci_dpm_force_performance_level(struct radeon_device *rdev,
 				   enum radeon_dpm_forced_level level);
 bool ci_dpm_vblank_too_short(struct radeon_device *rdev);
+void ci_dpm_powergate_uvd(struct radeon_device *rdev, bool gate);
 
 int kv_dpm_init(struct radeon_device *rdev);
 int kv_dpm_enable(struct radeon_device *rdev);