drm/amdgpu: Consolidate VCN firmware setup code

Roughly the same code was present in all VCN versions.
Consolidate it into a single function.

v2: use AMDGPU_UCODE_ID_VCN + i, check if num_inst >= 2

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Leo Liu <leo.liu@amd.com>
Reviewed-by: James Zhu <James.Zhu@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
index c7d3168..2658414 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
@@ -949,3 +949,30 @@ enum amdgpu_ring_priority_level amdgpu_vcn_get_enc_ring_prio(int ring)
                return AMDGPU_RING_PRIO_0;
        }
 }
+
+void amdgpu_vcn_setup_ucode(struct amdgpu_device *adev)
+{
+       int i;
+       unsigned int idx;
+
+       if (adev->firmware.load_type == AMDGPU_FW_LOAD_PSP) {
+               const struct common_firmware_header *hdr;
+               hdr = (const struct common_firmware_header *)adev->vcn.fw->data;
+
+               for (i = 0; i < adev->vcn.num_vcn_inst; i++) {
+                       if (adev->vcn.harvest_config & (1 << i))
+                               continue;
+                       /* currently only support 2 FW instances */
+                       if (i >= 2) {
+                               dev_info(adev->dev, "More then 2 VCN FW instances!\n");
+                               break;
+                       }
+                       idx = AMDGPU_UCODE_ID_VCN + i;
+                       adev->firmware.ucode[idx].ucode_id = idx;
+                       adev->firmware.ucode[idx].fw = adev->vcn.fw;
+                       adev->firmware.fw_size +=
+                               ALIGN(le32_to_cpu(hdr->ucode_size_bytes), PAGE_SIZE);
+               }
+               dev_info(adev->dev, "Will use PSP to load VCN firmware\n");
+       }
+}

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h
index 795cbaa..bfa27ea 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h
@@ -310,4 +310,6 @@ int amdgpu_vcn_enc_ring_test_ib(struct amdgpu_ring *ring, long timeout);
 
 enum amdgpu_ring_priority_level amdgpu_vcn_get_enc_ring_prio(int ring);
 
+void amdgpu_vcn_setup_ucode(struct amdgpu_device *adev);
+
 #endif

diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
index ad0d256..d54d720 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
@@ -111,15 +111,7 @@ static int vcn_v1_0_sw_init(void *handle)
        /* Override the work func */
        adev->vcn.idle_work.work.func = vcn_v1_0_idle_work_handler;
 
-       if (adev->firmware.load_type == AMDGPU_FW_LOAD_PSP) {
-               const struct common_firmware_header *hdr;
-               hdr = (const struct common_firmware_header *)adev->vcn.fw->data;
-               adev->firmware.ucode[AMDGPU_UCODE_ID_VCN].ucode_id = AMDGPU_UCODE_ID_VCN;
-               adev->firmware.ucode[AMDGPU_UCODE_ID_VCN].fw = adev->vcn.fw;
-               adev->firmware.fw_size +=
-                       ALIGN(le32_to_cpu(hdr->ucode_size_bytes), PAGE_SIZE);
-               dev_info(adev->dev, "Will use PSP to load VCN firmware\n");
-       }
+       amdgpu_vcn_setup_ucode(adev);
 
        r = amdgpu_vcn_resume(adev);
        if (r)

diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c
index 091d8c0..3883df5 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c
@@ -115,15 +115,7 @@ static int vcn_v2_0_sw_init(void *handle)
        if (r)
                return r;
 
-       if (adev->firmware.load_type == AMDGPU_FW_LOAD_PSP) {
-               const struct common_firmware_header *hdr;
-               hdr = (const struct common_firmware_header *)adev->vcn.fw->data;
-               adev->firmware.ucode[AMDGPU_UCODE_ID_VCN].ucode_id = AMDGPU_UCODE_ID_VCN;
-               adev->firmware.ucode[AMDGPU_UCODE_ID_VCN].fw = adev->vcn.fw;
-               adev->firmware.fw_size +=
-                       ALIGN(le32_to_cpu(hdr->ucode_size_bytes), PAGE_SIZE);
-               dev_info(adev->dev, "Will use PSP to load VCN firmware\n");
-       }
+       amdgpu_vcn_setup_ucode(adev);
 
        r = amdgpu_vcn_resume(adev);
        if (r)

diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c b/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c
index 59f469b..44fc4c2 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c
+++ b/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c
@@ -139,22 +139,7 @@ static int vcn_v2_5_sw_init(void *handle)
        if (r)
                return r;
 
-       if (adev->firmware.load_type == AMDGPU_FW_LOAD_PSP) {
-               const struct common_firmware_header *hdr;
-               hdr = (const struct common_firmware_header *)adev->vcn.fw->data;
-               adev->firmware.ucode[AMDGPU_UCODE_ID_VCN].ucode_id = AMDGPU_UCODE_ID_VCN;
-               adev->firmware.ucode[AMDGPU_UCODE_ID_VCN].fw = adev->vcn.fw;
-               adev->firmware.fw_size +=
-                       ALIGN(le32_to_cpu(hdr->ucode_size_bytes), PAGE_SIZE);
-
-               if (adev->vcn.num_vcn_inst == VCN25_MAX_HW_INSTANCES_ARCTURUS) {
-                       adev->firmware.ucode[AMDGPU_UCODE_ID_VCN1].ucode_id = AMDGPU_UCODE_ID_VCN1;
-                       adev->firmware.ucode[AMDGPU_UCODE_ID_VCN1].fw = adev->vcn.fw;
-                       adev->firmware.fw_size +=
-                               ALIGN(le32_to_cpu(hdr->ucode_size_bytes), PAGE_SIZE);
-               }
-               dev_info(adev->dev, "Will use PSP to load VCN firmware\n");
-       }
+       amdgpu_vcn_setup_ucode(adev);
 
        r = amdgpu_vcn_resume(adev);
        if (r)

diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c
index 4975257..57b62fb 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c
@@ -123,7 +123,6 @@ static int vcn_v3_0_sw_init(void *handle)
 {
        struct amdgpu_ring *ring;
        int i, j, r;
-       unsigned int idx;
        int vcn_doorbell_index = 0;
        struct amdgpu_device *adev = (struct amdgpu_device *)handle;
 
@@ -131,21 +130,7 @@ static int vcn_v3_0_sw_init(void *handle)
        if (r)
                return r;
 
-       if (adev->firmware.load_type == AMDGPU_FW_LOAD_PSP) {
-               const struct common_firmware_header *hdr;
-               hdr = (const struct common_firmware_header *)adev->vcn.fw->data;
-
-               for (i = 0; i < adev->vcn.num_vcn_inst; i++) {
-                       if (adev->vcn.harvest_config & (1 << i))
-                               continue;
-                       idx = AMDGPU_UCODE_ID_VCN + i;
-                       adev->firmware.ucode[idx].ucode_id = idx;
-                       adev->firmware.ucode[idx].fw = adev->vcn.fw;
-                       adev->firmware.fw_size +=
-                               ALIGN(le32_to_cpu(hdr->ucode_size_bytes), PAGE_SIZE);
-               }
-               dev_info(adev->dev, "Will use PSP to load VCN firmware\n");
-       }
+       amdgpu_vcn_setup_ucode(adev);
 
        r = amdgpu_vcn_resume(adev);
        if (r)