RE: [PATCH] drm/amdgpu: remove unnecessary asic check for sdma5.2

[Zhang, Hawking]

[AMD Public Use]

Good catch.
Reviewed-by: Hawking Zhang <hawking.zh...@amd.com>

Regards,
Hawking
-----Original Message-----
From: amd-gfx <amd-gfx-boun...@lists.freedesktop.org> On Behalf Of Jiansong Chen
Sent: Wednesday, December 30, 2020 19:50
To: amd-gfx@lists.freedesktop.org
Cc: Chen, Jiansong (Simon) <jiansong.c...@amd.com>; Zhou1, Tao 
<tao.zh...@amd.com>; Zhang, Hawking <hawking.zh...@amd.com>
Subject: [PATCH] drm/amdgpu: remove unnecessary asic check for sdma5.2

For sdma5.2, all sdma instances will share the same fw, remove unnecessary asic 
check to be more generic.

Signed-off-by: Jiansong Chen <jiansong.c...@amd.com>
Change-Id: I8b67dd588de9e7d54618404092a77b768bf0ddbd
---
 drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 31 +++++---------------------
 1 file changed, 5 insertions(+), 26 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c 
b/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c
index f1ba36a094da..690a5090475a 100644
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c
@@ -119,15 +119,7 @@ static int sdma_v5_2_init_inst_ctx(struct 
amdgpu_sdma_instance *sdma_inst)
 
 static void sdma_v5_2_destroy_inst_ctx(struct amdgpu_device *adev)  {
-       int i;
-
-       for (i = 0; i < adev->sdma.num_instances; i++) {
-               release_firmware(adev->sdma.instance[i].fw);
-               adev->sdma.instance[i].fw = NULL;
-
-               if (adev->asic_type == CHIP_SIENNA_CICHLID)
-                       break;
-       }
+       release_firmware(adev->sdma.instance[0].fw);
 
        memset((void *)adev->sdma.instance, 0,
               sizeof(struct amdgpu_sdma_instance) * 
AMDGPU_MAX_SDMA_INSTANCES); @@ -185,23 +177,10 @@ static int 
sdma_v5_2_init_microcode(struct amdgpu_device *adev)
        if (err)
                goto out;
 
-       for (i = 1; i < adev->sdma.num_instances; i++) {
-               if (adev->asic_type >= CHIP_SIENNA_CICHLID &&
-                   adev->asic_type <= CHIP_DIMGREY_CAVEFISH) {
-                       memcpy((void *)&adev->sdma.instance[i],
-                              (void *)&adev->sdma.instance[0],
-                              sizeof(struct amdgpu_sdma_instance));
-               } else {
-                       snprintf(fw_name, sizeof(fw_name), 
"amdgpu/%s_sdma%d.bin", chip_name, i);
-                       err = request_firmware(&adev->sdma.instance[i].fw, 
fw_name, adev->dev);
-                       if (err)
-                               goto out;
-
-                       err = sdma_v5_2_init_inst_ctx(&adev->sdma.instance[i]);
-                       if (err)
-                               goto out;
-               }
-       }
+       for (i = 1; i < adev->sdma.num_instances; i++)
+               memcpy((void *)&adev->sdma.instance[i],
+                      (void *)&adev->sdma.instance[0],
+                      sizeof(struct amdgpu_sdma_instance));
 
        DRM_DEBUG("psp_load == '%s'\n",
                  adev->firmware.load_type == AMDGPU_FW_LOAD_PSP ? "true" : 
"false");
--
2.25.1

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&amp;data=04%7C01%7Chawking.zhang%40amd.com%7Cfa8f0b431d804e0f321208d8acb915bf%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637449258234210202%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&amp;sdata=f57UsHkP1YnzX%2Bs%2BdNqROdyAm0LRNmyYfAFSONLr8Bs%3D&amp;reserved=0
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx