[PATCH 18/18] drm/amdgpu: set powergating state by vcn instance

[boyuan.zhang]

From: Boyuan Zhang <boyuan.zh...@amd.com>

Set powergating state by vcn instance in idle_work_handler() and
ring_begin_use() functions for vcn with multiple instances.

Signed-off-by: Boyuan Zhang <boyuan.zh...@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
index 28c5e15d166d..9a8e8f88e1ad 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
@@ -410,8 +410,12 @@ static void amdgpu_vcn_idle_work_handler(struct 
work_struct *work)
        fence += amdgpu_fence_count_emitted(&adev->vcn.inst[inst].ring_dec);
 
        if (!fence && !atomic_read(&adev->vcn.total_submission_cnt)) {
-               amdgpu_device_ip_set_powergating_state(adev, 
AMD_IP_BLOCK_TYPE_VCN,
-                      AMD_PG_STATE_GATE);
+               if (adev->vcn.num_vcn_inst > 1)
+                       amdgpu_device_ip_set_powergating_state_instance(adev,
+                               AMD_IP_BLOCK_TYPE_VCN, AMD_PG_STATE_GATE, inst);
+               else
+                       amdgpu_device_ip_set_powergating_state(adev, 
AMD_IP_BLOCK_TYPE_VCN,
+                               AMD_PG_STATE_GATE);
                r = amdgpu_dpm_switch_power_profile(adev, 
PP_SMC_POWER_PROFILE_VIDEO,
                                                                                
        false);
                if (r)
@@ -436,8 +440,12 @@ void amdgpu_vcn_ring_begin_use(struct amdgpu_ring *ring)
        }
 
        mutex_lock(&adev->vcn.vcn_pg_lock);
-       amdgpu_device_ip_set_powergating_state(adev, AMD_IP_BLOCK_TYPE_VCN,
-              AMD_PG_STATE_UNGATE);
+       if (adev->vcn.num_vcn_inst > 1)
+               amdgpu_device_ip_set_powergating_state_instance(adev,
+                       AMD_IP_BLOCK_TYPE_VCN, AMD_PG_STATE_UNGATE, ring->me);
+       else
+               amdgpu_device_ip_set_powergating_state(adev, 
AMD_IP_BLOCK_TYPE_VCN,
+                       AMD_PG_STATE_UNGATE);
 
        /* Only set DPG pause for VCN3 or below, VCN4 and above will be handled 
by FW */
        if (adev->pg_flags & AMD_PG_SUPPORT_VCN_DPG &&
-- 
2.34.1