[PATCH] drm/amdgpu: correct releasing the same sdma fw repeatedly

[Chen, Jiansong (Simon)]

Ok, I will send another patch.

Regards,
Jiansong
-----Original Message-----
From: Zhang, Hawking <Hawking.Zhang at amd.com> 
Sent: Wednesday, December 30, 2020 6:02 PM
To: Chen, Jiansong (Simon) <Jiansong.Chen at amd.com>; amd-gfx at lists.freedesktop.org
Cc: Zhou1, Tao <Tao.Zhou1 at amd.com>; Chen, Jiansong (Simon) <Jiansong.Chen at amd.com>
Subject: RE: [PATCH] drm/amdgpu: correct releasing the same sdma fw repeatedly

[AMD Public Use]

Shall we ignore this patch and wait for your latest fixes that remove the asic type check for sdma_v5_2.

I agree with you that should be more reasonable approach.

Regards,
Hawking

-----Original Message-----
From: Jiansong Chen <Jiansong.Chen at amd.com> 
Sent: Wednesday, December 30, 2020 17:23
To: amd-gfx at lists.freedesktop.org
Cc: Zhou1, Tao <Tao.Zhou1 at amd.com>; Zhang, Hawking <Hawking.Zhang at amd.com>; Chen, Jiansong (Simon) <Jiansong.Chen at amd.com>
Subject: [PATCH] drm/amdgpu: correct releasing the same sdma fw repeatedly

Same as sienna_cichlid, dimgrey_cavefish and navy_flounder reuse sdma0 fw for other instances, so free it only once.

Signed-off-by: Jiansong Chen <Jiansong.Chen at amd.com>
Change-Id: I9dda4a9b73e20243ee48f54d8f0c7593d7e7354b
---
 drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c b/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c
index f1ba36a094da..6ac314c8be32 100644
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c
@@ -125,7 +125,8 @@ static void sdma_v5_2_destroy_inst_ctx(struct amdgpu_device *adev)
 		release_firmware(adev->sdma.instance[i].fw);
 		adev->sdma.instance[i].fw = NULL;
 
-		if (adev->asic_type == CHIP_SIENNA_CICHLID)
+		if (adev->asic_type >= CHIP_SIENNA_CICHLID &&
+		    adev->asic_type <= CHIP_DIMGREY_CAVEFISH)
 			break;
 	}
 
--
2.25.1