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

drm/amd: Use `amdgpu_ucode_*` helpers for SDMA on CIK 



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 d7f50961

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

+6 −10
Original line number Diff line number Diff line
@@ -73,10 +73,9 @@ u32 amdgpu_cik_gpu_check_soft_reset(struct amdgpu_device *adev); 
static void cik_sdma_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);

}



/*
@@ -137,18 +136,15 @@ static int cik_sdma_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);

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

		if (err)

			goto out;

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

	}

out:

	if (err) {

		pr_err("cik_sdma: 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;

}