aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/radeon_pm.c
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2014-07-07 17:13:37 -0400
committerAlex Deucher <alexander.deucher@amd.com>2014-08-05 08:53:48 -0400
commit8f500af4efe347d1a8ac674d115220e8caa84559 (patch)
tree7fa801b32adf2478109c7f7194be54c77907be59 /drivers/gpu/drm/radeon/radeon_pm.c
parent404a6a512fdc6022d93fdd7085947f3a95f978c5 (diff)
drm/radeon: re-enable dpm by default on cayman
This patch depends on: b0880e87c1fd038b84498944f52e52c3e86ebe59 (drm/radeon/dpm: fix vddci setup typo on cayman) bug: https://bugs.freedesktop.org/show_bug.cgi?id=69723 Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Cc: stable@vger.kernel.org
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_pm.c')
-rw-r--r--drivers/gpu/drm/radeon/radeon_pm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/radeon_pm.c
index a06afee460be..97442c858500 100644
--- a/drivers/gpu/drm/radeon/radeon_pm.c
+++ b/drivers/gpu/drm/radeon/radeon_pm.c
@@ -1306,7 +1306,6 @@ int radeon_pm_init(struct radeon_device *rdev)
1306 case CHIP_BARTS: 1306 case CHIP_BARTS:
1307 case CHIP_TURKS: 1307 case CHIP_TURKS:
1308 case CHIP_CAICOS: 1308 case CHIP_CAICOS:
1309 case CHIP_CAYMAN:
1310 /* DPM requires the RLC, RV770+ dGPU requires SMC */ 1309 /* DPM requires the RLC, RV770+ dGPU requires SMC */
1311 if (!rdev->rlc_fw) 1310 if (!rdev->rlc_fw)
1312 rdev->pm.pm_method = PM_METHOD_PROFILE; 1311 rdev->pm.pm_method = PM_METHOD_PROFILE;
@@ -1330,6 +1329,7 @@ int radeon_pm_init(struct radeon_device *rdev)
1330 case CHIP_PALM: 1329 case CHIP_PALM:
1331 case CHIP_SUMO: 1330 case CHIP_SUMO:
1332 case CHIP_SUMO2: 1331 case CHIP_SUMO2:
1332 case CHIP_CAYMAN:
1333 case CHIP_ARUBA: 1333 case CHIP_ARUBA:
1334 case CHIP_TAHITI: 1334 case CHIP_TAHITI:
1335 case CHIP_PITCAIRN: 1335 case CHIP_PITCAIRN: