1 files changed, 4 insertions, 0 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
index af65c24cefe3..d0e87102e1b9 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
@@ -713,6 +713,7 @@ static int amdgpu_cgs_rel_firmware(struct cgs_device *cgs_device, enum cgs_ucode
         CGS_FUNC_ADEV;
         if ((CGS_UCODE_ID_SMU == type) || (CGS_UCODE_ID_SMU_SK == type)) {
                 release_firmware(adev->pm.fw);
+                adev->pm.fw = NULL;
                 return 0;
         }
         /* cannot release other firmware because they are not created by cgs */
@@ -808,6 +809,9 @@ static int amdgpu_cgs_get_firmware_info(struct cgs_device *cgs_device,
                 const uint8_t *src;
                 const struct smc_firmware_header_v1_0 *hdr;
 
+                if (CGS_UCODE_ID_SMU_SK == type)
+                        amdgpu_cgs_rel_firmware(cgs_device, CGS_UCODE_ID_SMU);
+
                 if (!adev->pm.fw) {
                         switch (adev->asic_type) {
                         case CHIP_TOPAZ: