drm/amd: Use `amdgpu_ucode_*` helpers for UVD

The `amdgpu_ucode_request` helper will ensure that the return code for
missing firmware is -ENODEV so that early_init can fail.

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>
Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
index a2204ebf0caf23127a49b31fb589522f262faefe..632a6ded57355ef93223b3bcbd6ca7431a45963b 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
@@ -260,19 +260,11 @@ int amdgpu_uvd_sw_init(struct amdgpu_device *adev)
                return -EINVAL;
        }
 
-       r = request_firmware(&adev->uvd.fw, fw_name, adev->dev);
-       if (r) {
-               dev_err(adev->dev, "amdgpu_uvd: Can't load firmware \"%s\"\n",
-                       fw_name);
-               return r;
-       }
-
-       r = amdgpu_ucode_validate(adev->uvd.fw);
+       r = amdgpu_ucode_request(adev, &adev->uvd.fw, fw_name);
        if (r) {
                dev_err(adev->dev, "amdgpu_uvd: Can't validate firmware \"%s\"\n",
                        fw_name);
-               release_firmware(adev->uvd.fw);
-               adev->uvd.fw = NULL;
+               amdgpu_ucode_release(&adev->uvd.fw);
                return r;
        }
 
@@ -397,7 +389,7 @@ int amdgpu_uvd_sw_fini(struct amdgpu_device *adev)
                        amdgpu_ring_fini(&adev->uvd.inst[j].ring_enc[i]);
        }
        amdgpu_bo_free_kernel(&adev->uvd.ib_bo, NULL, &addr);
-       release_firmware(adev->uvd.fw);
+       amdgpu_ucode_release(&adev->uvd.fw);
 
        return 0;
 }