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

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



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>
Reviewed-by: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent b31d3063

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

+2 −9
Original line number Diff line number Diff line
@@ -1883,20 +1883,13 @@ static int load_dmcu_fw(struct amdgpu_device *adev) 
		return 0;

	}



	r = request_firmware_direct(&adev->dm.fw_dmcu, fw_name_dmcu, adev->dev);

	if (r == -ENOENT) {

	r = amdgpu_ucode_request(adev, &adev->dm.fw_dmcu, fw_name_dmcu);

	if (r == -ENODEV) {

		/* DMCU firmware is not necessary, so don't raise a fuss if it's missing */

		DRM_DEBUG_KMS("dm: DMCU firmware not found\n");

		adev->dm.fw_dmcu = NULL;

		return 0;

	}

	if (r) {

		dev_err(adev->dev, "amdgpu_dm: Can't load firmware \"%s\"\n",

			fw_name_dmcu);

		return r;

	}



	r = amdgpu_ucode_validate(adev->dm.fw_dmcu);

	if (r) {

		dev_err(adev->dev, "amdgpu_dm: Can't validate firmware \"%s\"\n",

			fw_name_dmcu);