mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 10:40:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

drm/amd: Use amdgpu_ucode_* helpers for VCE

Browse source 
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>
This commit is contained in:
Mario Limonciello 2023-01-04 08:37:20 -06:00 committed by Alex Deucher
parent b406477c61
commit 52215e2a5d
1 changed files with 3 additions and 11 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
View file

@ -158,19 +158,11 @@ int amdgpu_vce_sw_init(struct amdgpu_device *adev, unsigned long size)
return -EINVAL; return -EINVAL;
} }
r = request_firmware(&adev->vce.fw, fw_name, adev->dev); r = amdgpu_ucode_request(adev, &adev->vce.fw, fw_name);
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);
if (r) { if (r) {
dev_err(adev->dev, "amdgpu_vce: Can't validate firmware \"%s\"\n", dev_err(adev->dev, "amdgpu_vce: Can't validate firmware \"%s\"\n",
fw_name); fw_name);
release_firmware(adev->vce.fw); amdgpu_ucode_release(&adev->vce.fw);
adev->vce.fw = NULL;
return r; return r;
} }
@ -228,7 +220,7 @@ int amdgpu_vce_sw_fini(struct amdgpu_device *adev)
for (i = 0; i < adev->vce.num_rings; i++) for (i = 0; i < adev->vce.num_rings; i++)
amdgpu_ring_fini(&adev->vce.ring[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); mutex_destroy(&adev->vce.idle_mutex);
return 0; return 0;