Commit e5a7d047 authored by Mario Limonciello's avatar Mario Limonciello Committed by Alex Deucher
Browse files

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



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 52215e2a

drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c

+2 −9
Original line number Diff line number Diff line
@@ -411,17 +411,10 @@ static int amdgpu_cgs_get_firmware_info(struct cgs_device *cgs_device, 
				return -EINVAL;

			}



			err = request_firmware(&adev->pm.fw, fw_name, adev->dev);

			if (err) {

				DRM_ERROR("Failed to request firmware\n");

				return err;

			}



			err = amdgpu_ucode_validate(adev->pm.fw);

			err = amdgpu_ucode_request(adev, &adev->pm.fw, fw_name);

			if (err) {

				DRM_ERROR("Failed to load firmware \"%s\"", fw_name);

				release_firmware(adev->pm.fw);

				adev->pm.fw = NULL;

				amdgpu_ucode_release(&adev->pm.fw);

				return err;

			}