[PATCH 5/6] [V2]drm/amdgpu: disable dpm before turn off clock when vce idle.

[Zhu, Rex]

Signed-off-by: Rex Zhu <Rex.Zhu at amd.com>
---
 drivers/gpu/drm/amd/amdgpu/ci_dpm.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/ci_dpm.c b/drivers/gpu/drm/amd/amdgpu/ci_dpm.c
index 54a7019..8f6e7a0 100644
--- a/drivers/gpu/drm/amd/amdgpu/ci_dpm.c
+++ b/drivers/gpu/drm/amd/amdgpu/ci_dpm.c
@@ -4258,13 +4258,12 @@ static int ci_update_vce_dpm(struct amdgpu_device *adev,
 
 			ret = ci_enable_vce_dpm(adev, true);
 		} else {
+			ret = ci_enable_vce_dpm(adev, false);
+			if (ret)
+				return ret;
 			/* turn the clocks off when not encoding */
 			ret = amdgpu_set_clockgating_state(adev, AMD_IP_BLOCK_TYPE_VCE,
 							    AMD_CG_STATE_GATE);
-			if (ret)
-				return ret;
-
-			ret = ci_enable_vce_dpm(adev, false);
 		}
 	}
 	return ret;
-- 
1.9.1
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0005-drm-amdgpu-disable-dpm-before-turn-off-clock-when-vc.patch
Type: application/octet-stream
Size: 1034 bytes
Desc: 0005-drm-amdgpu-disable-dpm-before-turn-off-clock-when-vc.patch
URL: <https://lists.freedesktop.org/archives/amd-gfx/attachments/20161026/d31da197/attachment.obj>