aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2011-07-25 18:50:08 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2011-08-04 21:58:36 -0700
commiteff0f0eb6357e141c1ebf6d3753e2b89177ab6db (patch)
tree501c49d25391e9e4df0128f6b79e35d83691a6fc /drivers/gpu/drm/radeon
parent803df865c9cae516da0181406716d8cfc1ce854e (diff)
downloadkernel_samsung_crespo-eff0f0eb6357e141c1ebf6d3753e2b89177ab6db.zip
kernel_samsung_crespo-eff0f0eb6357e141c1ebf6d3753e2b89177ab6db.tar.gz
kernel_samsung_crespo-eff0f0eb6357e141c1ebf6d3753e2b89177ab6db.tar.bz2
drm/radeon/kms: add missing vddci setting on NI+
commit 4639dd21e759e32125adc7171abf6cb8140d54cf upstream. Need to add vddci setting to pm init as well as resume. Fixes hangs on load on some boards. Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=38754 Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Dave Airlie <airlied@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/gpu/drm/radeon')
-rw-r--r--drivers/gpu/drm/radeon/radeon_pm.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/radeon_pm.c
index aaa19dc..6fabe89 100644
--- a/drivers/gpu/drm/radeon/radeon_pm.c
+++ b/drivers/gpu/drm/radeon/radeon_pm.c
@@ -594,6 +594,9 @@ int radeon_pm_init(struct radeon_device *rdev)
if (rdev->pm.default_vddc)
radeon_atom_set_voltage(rdev, rdev->pm.default_vddc,
SET_VOLTAGE_TYPE_ASIC_VDDC);
+ if (rdev->pm.default_vddci)
+ radeon_atom_set_voltage(rdev, rdev->pm.default_vddci,
+ SET_VOLTAGE_TYPE_ASIC_VDDCI);
if (rdev->pm.default_sclk)
radeon_set_engine_clock(rdev, rdev->pm.default_sclk);
if (rdev->pm.default_mclk)