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

drm/amd: Use `amdgpu_ucode_*` helpers for SDMA3.0 



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 10024cd7

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

+6 −12
Original line number Diff line number Diff line
@@ -250,10 +250,9 @@ static void sdma_v3_0_init_golden_registers(struct amdgpu_device *adev) 
static void sdma_v3_0_free_microcode(struct amdgpu_device *adev)

{

	int i;

	for (i = 0; i < adev->sdma.num_instances; i++) {

		release_firmware(adev->sdma.instance[i].fw);

		adev->sdma.instance[i].fw = NULL;

	}



	for (i = 0; i < adev->sdma.num_instances; i++)

		amdgpu_ucode_release(&adev->sdma.instance[i].fw);

}



/**
@@ -309,10 +308,7 @@ static int sdma_v3_0_init_microcode(struct amdgpu_device *adev) 
			snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_sdma.bin", chip_name);

		else

			snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_sdma1.bin", chip_name);

		err = request_firmware(&adev->sdma.instance[i].fw, fw_name, adev->dev);

		if (err)

			goto out;

		err = amdgpu_ucode_validate(adev->sdma.instance[i].fw);

		err = amdgpu_ucode_request(adev, &adev->sdma.instance[i].fw, fw_name);

		if (err)

			goto out;

		hdr = (const struct sdma_firmware_header_v1_0 *)adev->sdma.instance[i].fw->data;
@@ -332,10 +328,8 @@ static int sdma_v3_0_init_microcode(struct amdgpu_device *adev) 
out:

	if (err) {

		pr_err("sdma_v3_0: Failed to load firmware \"%s\"\n", fw_name);

		for (i = 0; i < adev->sdma.num_instances; i++) {

			release_firmware(adev->sdma.instance[i].fw);

			adev->sdma.instance[i].fw = NULL;

		}

		for (i = 0; i < adev->sdma.num_instances; i++)

			amdgpu_ucode_release(&adev->sdma.instance[i].fw);

	}

	return err;

}