Commit b406477c authored by Mario Limonciello's avatar Mario Limonciello Committed by Alex Deucher

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: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Signed-off-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent cb9bdfad
...@@ -260,19 +260,11 @@ int amdgpu_uvd_sw_init(struct amdgpu_device *adev) ...@@ -260,19 +260,11 @@ int amdgpu_uvd_sw_init(struct amdgpu_device *adev)
return -EINVAL; return -EINVAL;
} }
r = request_firmware(&adev->uvd.fw, fw_name, adev->dev); r = amdgpu_ucode_request(adev, &adev->uvd.fw, fw_name);
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);
if (r) { if (r) {
dev_err(adev->dev, "amdgpu_uvd: Can't validate firmware \"%s\"\n", dev_err(adev->dev, "amdgpu_uvd: Can't validate firmware \"%s\"\n",
fw_name); fw_name);
release_firmware(adev->uvd.fw); amdgpu_ucode_release(&adev->uvd.fw);
adev->uvd.fw = NULL;
return r; return r;
} }
...@@ -397,7 +389,7 @@ int amdgpu_uvd_sw_fini(struct amdgpu_device *adev) ...@@ -397,7 +389,7 @@ int amdgpu_uvd_sw_fini(struct amdgpu_device *adev)
amdgpu_ring_fini(&adev->uvd.inst[j].ring_enc[i]); amdgpu_ring_fini(&adev->uvd.inst[j].ring_enc[i]);
} }
amdgpu_bo_free_kernel(&adev->uvd.ib_bo, NULL, &addr); amdgpu_bo_free_kernel(&adev->uvd.ib_bo, NULL, &addr);
release_firmware(adev->uvd.fw); amdgpu_ucode_release(&adev->uvd.fw);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment