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

drm/amd: Use `amdgpu_ucode_*` helpers for GPU info bin

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 e5a7d047
...@@ -1985,17 +1985,10 @@ static int amdgpu_device_parse_gpu_info_fw(struct amdgpu_device *adev) ...@@ -1985,17 +1985,10 @@ static int amdgpu_device_parse_gpu_info_fw(struct amdgpu_device *adev)
} }
snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_gpu_info.bin", chip_name); snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_gpu_info.bin", chip_name);
err = request_firmware(&adev->firmware.gpu_info_fw, fw_name, adev->dev); err = amdgpu_ucode_request(adev, &adev->firmware.gpu_info_fw, fw_name);
if (err) { if (err) {
dev_err(adev->dev, dev_err(adev->dev,
"Failed to load gpu_info firmware \"%s\"\n", "Failed to get gpu_info firmware \"%s\"\n",
fw_name);
goto out;
}
err = amdgpu_ucode_validate(adev->firmware.gpu_info_fw);
if (err) {
dev_err(adev->dev,
"Failed to validate gpu_info firmware \"%s\"\n",
fw_name); fw_name);
goto out; goto out;
} }
...@@ -4033,8 +4026,7 @@ void amdgpu_device_fini_sw(struct amdgpu_device *adev) ...@@ -4033,8 +4026,7 @@ void amdgpu_device_fini_sw(struct amdgpu_device *adev)
amdgpu_fence_driver_sw_fini(adev); amdgpu_fence_driver_sw_fini(adev);
amdgpu_device_ip_fini(adev); amdgpu_device_ip_fini(adev);
release_firmware(adev->firmware.gpu_info_fw); amdgpu_ucode_release(&adev->firmware.gpu_info_fw);
adev->firmware.gpu_info_fw = NULL;
adev->accel_working = false; adev->accel_working = false;
dma_fence_put(rcu_dereference_protected(adev->gang_submit, true)); dma_fence_put(rcu_dereference_protected(adev->gang_submit, true));
......
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