From: Alex Deucher Date: Mon, 7 Jul 2014 21:13:37 +0000 (-0400) Subject: drm/radeon: re-enable dpm by default on cayman X-Git-Tag: MMI-PSA29.97-13-9~11757^2~6^2~18 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8f500af4efe347d1a8ac674d115220e8caa84559;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git 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 Cc: stable@vger.kernel.org --- 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) case CHIP_BARTS: case CHIP_TURKS: case CHIP_CAICOS: - case CHIP_CAYMAN: /* DPM requires the RLC, RV770+ dGPU requires SMC */ if (!rdev->rlc_fw) rdev->pm.pm_method = PM_METHOD_PROFILE; @@ -1330,6 +1329,7 @@ int radeon_pm_init(struct radeon_device *rdev) case CHIP_PALM: case CHIP_SUMO: case CHIP_SUMO2: + case CHIP_CAYMAN: case CHIP_ARUBA: case CHIP_TAHITI: case CHIP_PITCAIRN: