drm/amdgpu: Refactor VCN v5.0.1 HW init into separate instance function

Split the per-instance initialization code from vcn_v5_0_1_hw_init()
into a new vcn_v5_0_1_hw_init_inst() function. This improves code
organization by:

1. Separating the instance-specific initialization logic
2. Making the main init function more readable
3. Following the pattern used in queue reset

The SR-IOV specific initialization remains in the main function since
it has different requirements.

Reviewed-by: Sonny Jiang <sonny.jiang@amd.com>
Signed-off-by: Jesse Zhang <Jesse.Zhang@amd.com>
Signed-off-by: Ruili Ji <ruiliji2@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v5_0_1.c b/drivers/gpu/drm/amd/amdgpu/vcn_v5_0_1.c
index 9c281ba6bcedcfe6bb118949e0d32197fd136526..3677ea9ffa436ded6ca6b29ebb25a8a2fc8062ed 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/vcn_v5_0_1.c
+++ b/drivers/gpu/drm/amd/amdgpu/vcn_v5_0_1.c
@@ -253,6 +253,23 @@ static int vcn_v5_0_1_sw_fini(struct amdgpu_ip_block *ip_block)
        return 0;
 }
 
+static int vcn_v5_0_1_hw_init_inst(struct amdgpu_device *adev, int i)
+{
+       struct amdgpu_ring *ring;
+       int vcn_inst;
+
+       vcn_inst = GET_INST(VCN, i);
+       ring = &adev->vcn.inst[i].ring_enc[0];
+
+       if (ring->use_doorbell)
+               adev->nbio.funcs->vcn_doorbell_range(adev, ring->use_doorbell,
+                       ((adev->doorbell_index.vcn.vcn_ring0_1 << 1) +
+                       11 * vcn_inst),
+                       adev->vcn.inst[i].aid_id);
+
+       return 0;
+}
+
 /**
  * vcn_v5_0_1_hw_init - start and test VCN block
  *
@@ -264,7 +281,7 @@ static int vcn_v5_0_1_hw_init(struct amdgpu_ip_block *ip_block)
 {
        struct amdgpu_device *adev = ip_block->adev;
        struct amdgpu_ring *ring;
-       int i, r, vcn_inst;
+       int i, r;
 
        if (amdgpu_sriov_vf(adev)) {
                r = vcn_v5_0_1_start_sriov(adev);
@@ -282,14 +299,8 @@ static int vcn_v5_0_1_hw_init(struct amdgpu_ip_block *ip_block)
                if (RREG32_SOC15(VCN, GET_INST(VCN, 0), regVCN_RRMT_CNTL) & 0x100)
                        adev->vcn.caps |= AMDGPU_VCN_CAPS(RRMT_ENABLED);
                for (i = 0; i < adev->vcn.num_vcn_inst; ++i) {
-                       vcn_inst = GET_INST(VCN, i);
                        ring = &adev->vcn.inst[i].ring_enc[0];
-
-                       if (ring->use_doorbell)
-                               adev->nbio.funcs->vcn_doorbell_range(adev, ring->use_doorbell,
-                                       ((adev->doorbell_index.vcn.vcn_ring0_1 << 1) +
-                                       11 * vcn_inst),
-                                       adev->vcn.inst[i].aid_id);
+                       vcn_v5_0_1_hw_init_inst(adev, i);
 
                        /* Re-init fw_shared, if required */
                        vcn_v5_0_1_fw_shared_init(adev, i);