Re: [PATCH v6 25/45] drm/amd: Use `amdgpu_ucode_release` helper for DMUB

Harry Wentland
2023-01-05T17:25:25Z

On 1/4/23 22:42, Mario Limonciello wrote:
> The `amdgpu_ucode_release` helper is for symmetry on unloading.
>
> Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
> Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>

Reviewed-by: Harry Wentland <harry.wentland@amd.com>

Harry

> ---
> v5->v6:
> * Adjust for amdgpu_ucode_release argument change
> ---
> drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 10 +++-------
> 1 file changed, 3 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> index c8c5d37c8b3a..61c192ead62f 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> @@ -1898,8 +1898,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;
> }
>
> @@ -2113,11 +2112,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;
> }