drm/amdgpu/vcn3.0: add set_pg_state callback

Rework the code as a vcn instance callback.

Reviewed-by: Boyuan Zhang <Boyuan.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c
index 7e98f251f23e6ed6844ae79ec1323ca37ec4043e..78438541c29aa07d4162b4fd54fd0d05512da2b0 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c
@@ -105,9 +105,8 @@ static int vcn_v3_0_start_sriov(struct amdgpu_device *adev);
 static void vcn_v3_0_set_dec_ring_funcs(struct amdgpu_device *adev);
 static void vcn_v3_0_set_enc_ring_funcs(struct amdgpu_device *adev);
 static void vcn_v3_0_set_irq_funcs(struct amdgpu_device *adev);
-static int vcn_v3_0_set_powergating_state_inst(struct amdgpu_ip_block *ip_block,
-                                              enum amd_powergating_state state,
-                                              int i);
+static int vcn_v3_0_set_pg_state(struct amdgpu_vcn_inst *vinst,
+                                enum amd_powergating_state state);
 static int vcn_v3_0_set_powergating_state(struct amdgpu_ip_block *ip_block,
                                          enum amd_powergating_state state);
 static int vcn_v3_0_pause_dpg_mode(struct amdgpu_vcn_inst *vinst,
@@ -155,6 +154,8 @@ static int vcn_v3_0_early_init(struct amdgpu_ip_block *ip_block)
        vcn_v3_0_set_irq_funcs(adev);
 
        for (i = 0; i < adev->vcn.num_vcn_inst; i++) {
+               adev->vcn.inst[i].set_pg_state = vcn_v3_0_set_pg_state;
+
                r = amdgpu_vcn_early_init(adev, i);
                if (r)
                        return r;
@@ -440,18 +441,18 @@ static int vcn_v3_0_hw_fini(struct amdgpu_ip_block *ip_block)
        int i;
 
        for (i = 0; i < adev->vcn.num_vcn_inst; ++i) {
+               struct amdgpu_vcn_inst *vinst = &adev->vcn.inst[i];
+
                if (adev->vcn.harvest_config & (1 << i))
                        continue;
 
-               cancel_delayed_work_sync(&adev->vcn.inst[i].idle_work);
+               cancel_delayed_work_sync(&vinst->idle_work);
 
                if (!amdgpu_sriov_vf(adev)) {
                        if ((adev->pg_flags & AMD_PG_SUPPORT_VCN_DPG) ||
-                           (adev->vcn.inst[i].cur_state != AMD_PG_STATE_GATE &&
+                           (vinst->cur_state != AMD_PG_STATE_GATE &&
                             RREG32_SOC15(VCN, i, mmUVD_STATUS))) {
-                               vcn_v3_0_set_powergating_state_inst(ip_block,
-                                                                   AMD_PG_STATE_GATE,
-                                                                   i);
+                               vinst->set_pg_state(vinst, AMD_PG_STATE_GATE);
                        }
                }
        }
@@ -2203,12 +2204,10 @@ static int vcn_v3_0_set_clockgating_state(struct amdgpu_ip_block *ip_block,
        return 0;
 }
 
-static int vcn_v3_0_set_powergating_state_inst(struct amdgpu_ip_block *ip_block,
-                                              enum amd_powergating_state state,
-                                              int i)
+static int vcn_v3_0_set_pg_state(struct amdgpu_vcn_inst *vinst,
+                                enum amd_powergating_state state)
 {
-       struct amdgpu_device *adev = ip_block->adev;
-       struct amdgpu_vcn_inst *vinst = &adev->vcn.inst[i];
+       struct amdgpu_device *adev = vinst->adev;
        int ret = 0;
 
        /* for SRIOV, guest should not control VCN Power-gating
@@ -2216,11 +2215,11 @@ static int vcn_v3_0_set_powergating_state_inst(struct amdgpu_ip_block *ip_block,
         * guest should avoid touching CGC and PG
         */
        if (amdgpu_sriov_vf(adev)) {
-               adev->vcn.inst[i].cur_state = AMD_PG_STATE_UNGATE;
+               vinst->cur_state = AMD_PG_STATE_UNGATE;
                return 0;
        }
 
-       if (state == adev->vcn.inst[i].cur_state)
+       if (state == vinst->cur_state)
                return 0;
 
        if (state == AMD_PG_STATE_GATE)
@@ -2229,7 +2228,7 @@ static int vcn_v3_0_set_powergating_state_inst(struct amdgpu_ip_block *ip_block,
                ret = vcn_v3_0_start(vinst);
 
        if (!ret)
-               adev->vcn.inst[i].cur_state = state;
+               vinst->cur_state = state;
 
        return ret;
 }
@@ -2240,9 +2239,11 @@ static int vcn_v3_0_set_powergating_state(struct amdgpu_ip_block *ip_block,
        struct amdgpu_device *adev = ip_block->adev;
        int ret = 0, i;
 
-       for (i = 0; i < adev->vcn.num_vcn_inst; ++i)
-               ret |= vcn_v3_0_set_powergating_state_inst(ip_block,
-                                                          state, i);
+       for (i = 0; i < adev->vcn.num_vcn_inst; ++i) {
+               struct amdgpu_vcn_inst *vinst = &adev->vcn.inst[i];
+
+               ret |= vinst->set_pg_state(vinst, state);
+       }
 
        return ret;
 }