projects / thirdparty / kernel / stable-queue.git / blame
| Commit | Line | Data |
|---|---|---|
| 7cb15094 GKH |
1 | From 4639dd21e759e32125adc7171abf6cb8140d54cf Mon Sep 17 00:00:00 2001 |
| 2 | From: Alex Deucher <alexander.deucher@amd.com> | |
| 3 | Date: Mon, 25 Jul 2011 18:50:08 -0400 | |
| 4 | Subject: drm/radeon/kms: add missing vddci setting on NI+ | |
| 5 | ||
| 6 | From: Alex Deucher <alexander.deucher@amd.com> | |
| 7 | ||
| 8 | commit 4639dd21e759e32125adc7171abf6cb8140d54cf upstream. | |
| 9 | ||
| 10 | Need to add vddci setting to pm init as well as | |
| 11 | resume. Fixes hangs on load on some boards. | |
| 12 | ||
| 13 | Fixes: | |
| 14 | https://bugs.freedesktop.org/show_bug.cgi?id=38754 | |
| 15 | ||
| 16 | Signed-off-by: Alex Deucher <alexander.deucher@amd.com> | |
| 17 | Signed-off-by: Dave Airlie <airlied@redhat.com> | |
| 18 | Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> | |
| 19 | ||
| 20 | --- | |
| 21 | drivers/gpu/drm/radeon/radeon_pm.c | 3 +++ | |
| 22 | 1 file changed, 3 insertions(+) | |
| 23 | ||
| 24 | --- a/drivers/gpu/drm/radeon/radeon_pm.c | |
| 25 | +++ b/drivers/gpu/drm/radeon/radeon_pm.c | |
| 26 | @@ -594,6 +594,9 @@ int radeon_pm_init(struct radeon_device | |
| 27 | if (rdev->pm.default_vddc) | |
| 28 | radeon_atom_set_voltage(rdev, rdev->pm.default_vddc, | |
| 29 | SET_VOLTAGE_TYPE_ASIC_VDDC); | |
| 30 | + if (rdev->pm.default_vddci) | |
| 31 | + radeon_atom_set_voltage(rdev, rdev->pm.default_vddci, | |
| 32 | + SET_VOLTAGE_TYPE_ASIC_VDDCI); | |
| 33 | if (rdev->pm.default_sclk) | |
| 34 | radeon_set_engine_clock(rdev, rdev->pm.default_sclk); | |
| 35 | if (rdev->pm.default_mclk) |