drm/radeon/kms: add missing vddci setting on NI+
authorAlex Deucher <alexander.deucher@amd.com>
Mon, 25 Jul 2011 22:50:08 +0000 (18:50 -0400)
committerDave Airlie <airlied@redhat.com>
Tue, 26 Jul 2011 11:30:34 +0000 (12:30 +0100)
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>
Cc: stable@kernel.org
Signed-off-by: Dave Airlie <airlied@redhat.com>
drivers/gpu/drm/radeon/radeon_pm.c

index aaa19dc418a0f0bf194d789592de943d3e5c2dca..6fabe89fa6a18da11ce5636961b717f84b9b9491 100644 (file)
@@ -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)