drm/amdgpu: refine sdma firmware loading

refine sdma firmware loading

Signed-off-by: Yang Wang <kevinyang.wang@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c
index 151f83ea803bb3bf905b656dec95b59ec864ef7e..183a976ba29dd010475ffd9b32ab2fdb16d44b55 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c
@@ -215,14 +215,14 @@ int amdgpu_sdma_init_microcode(struct amdgpu_device *adev,
        const struct sdma_firmware_header_v3_0 *sdma_hv3;
        uint16_t version_major;
        char ucode_prefix[30];
-       char fw_name[52];
 
        amdgpu_ucode_ip_version_decode(adev, SDMA0_HWIP, ucode_prefix, sizeof(ucode_prefix));
        if (instance == 0)
-               snprintf(fw_name, sizeof(fw_name), "amdgpu/%s.bin", ucode_prefix);
+               err = amdgpu_ucode_request(adev, &adev->sdma.instance[instance].fw,
+                                          "amdgpu/%s.bin", ucode_prefix);
        else
-               snprintf(fw_name, sizeof(fw_name), "amdgpu/%s%d.bin", ucode_prefix, instance);
-       err = amdgpu_ucode_request(adev, &adev->sdma.instance[instance].fw, fw_name);
+               err = amdgpu_ucode_request(adev, &adev->sdma.instance[instance].fw,
+                                          "amdgpu/%s%d.bin", ucode_prefix, instance);
        if (err)
                goto out;
 

diff --git a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
index 6948ebda0fa2a35e8d55ceff294a6df47b052631..952737de94111c9a771036fbc4954ab71cdcd350 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
+++ b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
@@ -107,7 +107,6 @@ static void cik_sdma_free_microcode(struct amdgpu_device *adev)
 static int cik_sdma_init_microcode(struct amdgpu_device *adev)
 {
        const char *chip_name;
-       char fw_name[30];
        int err = 0, i;
 
        DRM_DEBUG("\n");
@@ -133,16 +132,18 @@ static int cik_sdma_init_microcode(struct amdgpu_device *adev)
 
        for (i = 0; i < adev->sdma.num_instances; i++) {
                if (i == 0)
-                       snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_sdma.bin", chip_name);
+                       err = amdgpu_ucode_request(adev, &adev->sdma.instance[i].fw,
+                                                  "amdgpu/%s_sdma.bin", chip_name);
                else
-                       snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_sdma1.bin", chip_name);
-               err = amdgpu_ucode_request(adev, &adev->sdma.instance[i].fw, fw_name);
+                       err = amdgpu_ucode_request(adev, &adev->sdma.instance[i].fw,
+                                                  "amdgpu/%s_sdma1.bin", chip_name);
                if (err)
                        goto out;
        }
 out:
        if (err) {
-               pr_err("cik_sdma: Failed to load firmware \"%s\"\n", fw_name);
+               pr_err("cik_sdma: Failed to load firmware \"%s_sdma%s.bin\"\n",
+                      chip_name, i == 0 ? "" : "1");
                for (i = 0; i < adev->sdma.num_instances; i++)
                        amdgpu_ucode_release(&adev->sdma.instance[i].fw);
        }

diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
index ac8a9b9b3e521c4624290c1345ec7e3cf531478c..725392522267ff2aeeeba514ad225513b09dfa84 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
@@ -127,7 +127,6 @@ static void sdma_v2_4_free_microcode(struct amdgpu_device *adev)
 static int sdma_v2_4_init_microcode(struct amdgpu_device *adev)
 {
        const char *chip_name;
-       char fw_name[30];
        int err = 0, i;
        struct amdgpu_firmware_info *info = NULL;
        const struct common_firmware_header *header = NULL;
@@ -145,10 +144,11 @@ static int sdma_v2_4_init_microcode(struct amdgpu_device *adev)
 
        for (i = 0; i < adev->sdma.num_instances; i++) {
                if (i == 0)
-                       snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_sdma.bin", chip_name);
+                       err = amdgpu_ucode_request(adev, &adev->sdma.instance[i].fw,
+                                                  "amdgpu/%s_sdma.bin", chip_name);
                else
-                       snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_sdma1.bin", chip_name);
-               err = amdgpu_ucode_request(adev, &adev->sdma.instance[i].fw, fw_name);
+                       err = amdgpu_ucode_request(adev, &adev->sdma.instance[i].fw,
+                                                  "amdgpu/%s_sdma1.bin", chip_name);
                if (err)
                        goto out;
                hdr = (const struct sdma_firmware_header_v1_0 *)adev->sdma.instance[i].fw->data;
@@ -169,7 +169,8 @@ static int sdma_v2_4_init_microcode(struct amdgpu_device *adev)
 
 out:
        if (err) {
-               pr_err("sdma_v2_4: Failed to load firmware \"%s\"\n", fw_name);
+               pr_err("sdma_v2_4: Failed to load firmware \"%s_sdma%s.bin\"\n",
+                      chip_name, i == 0 ? "" : "1");
                for (i = 0; i < adev->sdma.num_instances; i++)
                        amdgpu_ucode_release(&adev->sdma.instance[i].fw);
        }

diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
index b8ebdc4ae6f60158a7874ee3f623597c2cf1a0fb..aa637541da5844181af63b6435452cba4d6fbc5d 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
@@ -267,7 +267,6 @@ static void sdma_v3_0_free_microcode(struct amdgpu_device *adev)
 static int sdma_v3_0_init_microcode(struct amdgpu_device *adev)
 {
        const char *chip_name;
-       char fw_name[30];
        int err = 0, i;
        struct amdgpu_firmware_info *info = NULL;
        const struct common_firmware_header *header = NULL;
@@ -305,10 +304,11 @@ static int sdma_v3_0_init_microcode(struct amdgpu_device *adev)
 
        for (i = 0; i < adev->sdma.num_instances; i++) {
                if (i == 0)
-                       snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_sdma.bin", chip_name);
+                       err = amdgpu_ucode_request(adev, &adev->sdma.instance[i].fw,
+                                                  "amdgpu/%s_sdma.bin", chip_name);
                else
-                       snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_sdma1.bin", chip_name);
-               err = amdgpu_ucode_request(adev, &adev->sdma.instance[i].fw, fw_name);
+                       err = amdgpu_ucode_request(adev, &adev->sdma.instance[i].fw,
+                                                  "amdgpu/%s_sdma1.bin", chip_name);
                if (err)
                        goto out;
                hdr = (const struct sdma_firmware_header_v1_0 *)adev->sdma.instance[i].fw->data;
@@ -327,7 +327,8 @@ static int sdma_v3_0_init_microcode(struct amdgpu_device *adev)
        }
 out:
        if (err) {
-               pr_err("sdma_v3_0: Failed to load firmware \"%s\"\n", fw_name);
+               pr_err("sdma_v3_0: Failed to load firmware \"%s_sdma%s.bin\"\n",
+                      chip_name, i == 0 ? "" : "1");
                for (i = 0; i < adev->sdma.num_instances; i++)
                        amdgpu_ucode_release(&adev->sdma.instance[i].fw);
        }