drm/amd: Use `amdgpu_ucode_release` helper for DMUB
authorMario Limonciello <mario.limonciello@amd.com>
Wed, 4 Jan 2023 05:49:43 +0000 (23:49 -0600)
committerAlex Deucher <alexander.deucher@amd.com>
Tue, 10 Jan 2023 19:32:57 +0000 (14:32 -0500)
The `amdgpu_ucode_release` helper is for symmetry on unloading.

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Lijo Lazar <lijo.lazar@amd.com>
Reviewed-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

index 9bf892838599ea73014a02b753565430ba183f91..a8c0bcaa391c231f3742fbfb6d0105c163d3de0e 100644 (file)
@@ -1900,8 +1900,7 @@ static int load_dmcu_fw(struct amdgpu_device *adev)
        if (r) {
                dev_err(adev->dev, "amdgpu_dm: Can't validate firmware \"%s\"\n",
                        fw_name_dmcu);
-               release_firmware(adev->dm.fw_dmcu);
-               adev->dm.fw_dmcu = NULL;
+               amdgpu_ucode_release(&adev->dm.fw_dmcu);
                return r;
        }
 
@@ -2117,11 +2116,8 @@ static int dm_sw_fini(void *handle)
                adev->dm.dmub_srv = NULL;
        }
 
-       release_firmware(adev->dm.dmub_fw);
-       adev->dm.dmub_fw = NULL;
-
-       release_firmware(adev->dm.fw_dmcu);
-       adev->dm.fw_dmcu = NULL;
+       amdgpu_ucode_release(&adev->dm.dmub_fw);
+       amdgpu_ucode_release(&adev->dm.fw_dmcu);
 
        return 0;
 }