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

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_vce.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
index 7d93e39..2fb6141 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
@@ -158,19 +158,11 @@ int amdgpu_vce_sw_init(struct amdgpu_device *adev, unsigned long size)
                return -EINVAL;
        }
 
-       r = request_firmware(&adev->vce.fw, fw_name, adev->dev);
-       if (r) {
-               dev_err(adev->dev, "amdgpu_vce: Can't load firmware \"%s\"\n",
-                       fw_name);
-               return r;
-       }
-
-       r = amdgpu_ucode_validate(adev->vce.fw);
+       r = amdgpu_ucode_request(adev, &adev->vce.fw, fw_name);
        if (r) {
                dev_err(adev->dev, "amdgpu_vce: Can't validate firmware \"%s\"\n",
                        fw_name);
-               release_firmware(adev->vce.fw);
-               adev->vce.fw = NULL;
+               amdgpu_ucode_release(&adev->vce.fw);
                return r;
        }
 
@@ -228,7 +220,7 @@ int amdgpu_vce_sw_fini(struct amdgpu_device *adev)
        for (i = 0; i < adev->vce.num_rings; i++)
                amdgpu_ring_fini(&adev->vce.ring[i]);
 
-       release_firmware(adev->vce.fw);
+       amdgpu_ucode_release(&adev->vce.fw);
        mutex_destroy(&adev->vce.idle_mutex);
 
        return 0;