drm/amdgpu: disable dpm before turn off clock when vce idle.

v2: move return value check as well

Signed-off-by: Rex Zhu <[email protected]>
Reviewed-by: Christian König <[email protected]>
Reviewed-by: Alex Deucher <[email protected]>
Signed-off-by: Alex Deucher <[email protected]>

diff --git a/drivers/gpu/drm/amd/amdgpu/ci_dpm.c b/drivers/gpu/drm/amd/amdgpu/ci_dpm.c
index f1baf6715b05c61e878d5a222f7967e356994823..3295fbbdf8c85e73a19f0f0dcf2103f52888bc5f 100644 (file)
--- 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;