summaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorAlex Deucher2013-08-30 22:24:33 +0200
committerAlex Deucher2013-08-30 22:31:25 +0200
commit679fe80fbe964ea7f9f71781c2ca65b630949da3 (patch)
tree309b8269d5906c68a5419abc853cc7f0dea72e22 /drivers/gpu
parentdrm/radeon/dpm: make sure dc performance level limits are valid (BTC-SI) (v2) (diff)
downloadkernel-qcow2-linux-679fe80fbe964ea7f9f71781c2ca65b630949da3.tar.gz
kernel-qcow2-linux-679fe80fbe964ea7f9f71781c2ca65b630949da3.tar.xz
kernel-qcow2-linux-679fe80fbe964ea7f9f71781c2ca65b630949da3.zip
drm/radeon/dpm: make sure dc performance level limits are valid (CI)
Check to make sure the dc limits are valid before using them. Some systems may not have a dc limits table. In that case just use the ac limits. This fixes hangs on systems when the power state is changed when on battery (dc) due to invalid performance state parameters. Should fix: https://bugs.freedesktop.org/show_bug.cgi?id=68708 Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/radeon/ci_dpm.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/ci_dpm.c b/drivers/gpu/drm/radeon/ci_dpm.c
index dd2a07c44c3a..916630fdc796 100644
--- a/drivers/gpu/drm/radeon/ci_dpm.c
+++ b/drivers/gpu/drm/radeon/ci_dpm.c
@@ -5179,6 +5179,12 @@ int ci_dpm_init(struct radeon_device *rdev)
pi->uvd_power_gated = false;
+ /* make sure dc limits are valid */
+ if ((rdev->pm.dpm.dyn_state.max_clock_voltage_on_dc.sclk == 0) ||
+ (rdev->pm.dpm.dyn_state.max_clock_voltage_on_dc.mclk == 0))
+ rdev->pm.dpm.dyn_state.max_clock_voltage_on_dc =
+ rdev->pm.dpm.dyn_state.max_clock_voltage_on_ac;
+
return 0;
}