[PATCH review for 4.9 18/50] drm/amdgpu: when dpm disabled, also need to stop/start vce.

[Levin, Alexander (Sasha Levin)]

From: Rex Zhu <rex....@amd.com>

[ Upstream commit 28ed5504ab4b211a4e589e648e5ebd1e0caa7a6a ]

Signed-off-by: Rex Zhu <rex....@amd.com>
Reviewed-by: Alex Deucher <alexander.deuc...@amd.com>
Acked-by: Christian König <christian.koe...@amd.com>
Signed-off-by: Alex Deucher <alexander.deuc...@amd.com>
Signed-off-by: Sasha Levin <alexander.le...@verizon.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
index 7fe8fd884f06..743a12df6971 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
@@ -315,6 +315,10 @@ static void amdgpu_vce_idle_work_handler(struct 
work_struct *work)
                        amdgpu_dpm_enable_vce(adev, false);
                } else {
                        amdgpu_asic_set_vce_clocks(adev, 0, 0);
+                       amdgpu_set_powergating_state(adev, 
AMD_IP_BLOCK_TYPE_VCE,
+                                                           AMD_PG_STATE_GATE);
+                       amdgpu_set_clockgating_state(adev, 
AMD_IP_BLOCK_TYPE_VCE,
+                                                           AMD_CG_STATE_GATE);
                }
        } else {
                schedule_delayed_work(&adev->vce.idle_work, VCE_IDLE_TIMEOUT);
@@ -340,6 +344,11 @@ void amdgpu_vce_ring_begin_use(struct amdgpu_ring *ring)
                        amdgpu_dpm_enable_vce(adev, true);
                } else {
                        amdgpu_asic_set_vce_clocks(adev, 53300, 40000);
+                       amdgpu_set_clockgating_state(adev, 
AMD_IP_BLOCK_TYPE_VCE,
+                                                           
AMD_CG_STATE_UNGATE);
+                       amdgpu_set_powergating_state(adev, 
AMD_IP_BLOCK_TYPE_VCE,
+                                                           
AMD_PG_STATE_UNGATE);
+
                }
        }
        mutex_unlock(&adev->vce.idle_mutex);
-- 
2.11.0