From: Sonny Jiang <sonny.jiang@amd.com>
Date: Fri, 26 Jun 2015 16:31:46 +0000 (-0400)
Subject: drm/amdgpu: disable enable_nb_ps_policy temporarily
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=9dcabece15d16da48bb7c7071306bf6158b42ba3;p=deliverable%2Flinux.git

drm/amdgpu: disable enable_nb_ps_policy temporarily

Fixes a hang on resume.

Signed-off-by: Sonny Jiang <sonny.jiang@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
---

diff --git a/drivers/gpu/drm/amd/amdgpu/cz_dpm.c b/drivers/gpu/drm/amd/amdgpu/cz_dpm.c
index e4936a452bc6..f75a31df30bd 100644
--- a/drivers/gpu/drm/amd/amdgpu/cz_dpm.c
+++ b/drivers/gpu/drm/amd/amdgpu/cz_dpm.c
@@ -425,7 +425,7 @@ static int cz_dpm_init(struct amdgpu_device *adev)
 	pi->mgcg_cgtt_local1 = 0x0;
 	pi->clock_slow_down_step = 25000;
 	pi->skip_clock_slow_down = 1;
-	pi->enable_nb_ps_policy = 1;
+	pi->enable_nb_ps_policy = 0;
 	pi->caps_power_containment = true;
 	pi->caps_cac = true;
 	pi->didt_enabled = false;