Browse Source

drm/radeon/dpm: track uvd gated state for ci

Track the current uvd gated state on CI to avoid unnecessary
state changes when uvd is active.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Alex Deucher 12 years ago
parent
commit
47acb1ff9b
2 changed files with 14 additions and 0 deletions
  1. 13 0
      drivers/gpu/drm/radeon/ci_dpm.c
  2. 1 0
      drivers/gpu/drm/radeon/ci_dpm.h

+ 13 - 0
drivers/gpu/drm/radeon/ci_dpm.c

@@ -681,6 +681,13 @@ static int ci_power_control_set_level(struct radeon_device *rdev)
 
 void ci_dpm_powergate_uvd(struct radeon_device *rdev, bool gate)
 {
+	struct ci_power_info *pi = ci_get_pi(rdev);
+
+	if (pi->uvd_power_gated == gate)
+		return;
+
+	pi->uvd_power_gated = gate;
+
 	ci_update_uvd_dpm(rdev, gate);
 }
 
@@ -4620,6 +4627,8 @@ int ci_dpm_enable(struct radeon_device *rdev)
 
 	ci_enable_auto_throttle_source(rdev, RADEON_DPM_AUTO_THROTTLE_SRC_THERMAL, true);
 
+	ci_dpm_powergate_uvd(rdev, true);
+
 	cik_update_cg(rdev, (RADEON_CG_BLOCK_GFX |
 			     RADEON_CG_BLOCK_MC |
 			     RADEON_CG_BLOCK_SDMA |
@@ -4643,6 +4652,8 @@ void ci_dpm_disable(struct radeon_device *rdev)
 			     RADEON_CG_BLOCK_UVD |
 			     RADEON_CG_BLOCK_HDP), false);
 
+	ci_dpm_powergate_uvd(rdev, false);
+
 	if (!ci_is_smc_running(rdev))
 		return;
 
@@ -5163,6 +5174,8 @@ int ci_dpm_init(struct radeon_device *rdev)
 
 	pi->caps_dynamic_ac_timing = true;
 
+	pi->uvd_power_gated = false;
+
 	return 0;
 }
 

+ 1 - 0
drivers/gpu/drm/radeon/ci_dpm.h

@@ -279,6 +279,7 @@ struct ci_power_info {
 	bool enable_pkg_pwr_tracking_feature;
 	bool use_pcie_performance_levels;
 	bool use_pcie_powersaving_levels;
+	bool uvd_power_gated;
 	/* driver states */
 	struct radeon_ps current_rps;
 	struct ci_ps current_ps;