From 45db9f3e369279b20b99ff311c01f4bb7dc7e45a Mon Sep 17 00:00:00 2001
From: Alex Deucher <alexander.deucher@amd.com>
Date: Mon, 26 Aug 2013 09:43:24 -0400
Subject: [PATCH] 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>
---
drivers/gpu/drm/radeon/ci_dpm.c | 13 +++++++++++++
drivers/gpu/drm/radeon/ci_dpm.h | 1 +
2 files changed, 14 insertions(+)
diff --git a/drivers/gpu/drm/radeon/ci_dpm.c b/drivers/gpu/drm/radeon/ci_dpm.c
index 4ba1fd4918e9d..7a6068968b70c 100644
--- a/drivers/gpu/drm/radeon/ci_dpm.c
+++ b/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;
}
diff --git a/drivers/gpu/drm/radeon/ci_dpm.h b/drivers/gpu/drm/radeon/ci_dpm.h
index de504b5ac33fd..93bbed977ffb4 100644
--- a/drivers/gpu/drm/radeon/ci_dpm.h
+++ b/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;
--
2.39.5