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

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



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 will provide symmetry on unload.

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 e78105c8

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

+21 −61
Original line number Diff line number Diff line
@@ -1078,18 +1078,12 @@ static int gfx_v9_0_ring_test_ib(struct amdgpu_ring *ring, long timeout) 


static void gfx_v9_0_free_microcode(struct amdgpu_device *adev)

{

	release_firmware(adev->gfx.pfp_fw);

	adev->gfx.pfp_fw = NULL;

	release_firmware(adev->gfx.me_fw);

	adev->gfx.me_fw = NULL;

	release_firmware(adev->gfx.ce_fw);

	adev->gfx.ce_fw = NULL;

	release_firmware(adev->gfx.rlc_fw);

	adev->gfx.rlc_fw = NULL;

	release_firmware(adev->gfx.mec_fw);

	adev->gfx.mec_fw = NULL;

	release_firmware(adev->gfx.mec2_fw);

	adev->gfx.mec2_fw = NULL;

	amdgpu_ucode_release(&adev->gfx.pfp_fw);

	amdgpu_ucode_release(&adev->gfx.me_fw);

	amdgpu_ucode_release(&adev->gfx.ce_fw);

	amdgpu_ucode_release(&adev->gfx.rlc_fw);

	amdgpu_ucode_release(&adev->gfx.mec_fw);

	amdgpu_ucode_release(&adev->gfx.mec2_fw);



	kfree(adev->gfx.rlc.register_list_format);

}
@@ -1257,43 +1251,28 @@ static int gfx_v9_0_init_cp_gfx_microcode(struct amdgpu_device *adev, 
	int err;



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

	err = request_firmware(&adev->gfx.pfp_fw, fw_name, adev->dev);

	if (err)

		goto out;

	err = amdgpu_ucode_validate(adev->gfx.pfp_fw);

	err = amdgpu_ucode_request(adev, &adev->gfx.pfp_fw, fw_name);

	if (err)

		goto out;

	amdgpu_gfx_cp_init_microcode(adev, AMDGPU_UCODE_ID_CP_PFP);



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

	err = request_firmware(&adev->gfx.me_fw, fw_name, adev->dev);

	if (err)

		goto out;

	err = amdgpu_ucode_validate(adev->gfx.me_fw);

	err = amdgpu_ucode_request(adev, &adev->gfx.me_fw, fw_name);

	if (err)

		goto out;

	amdgpu_gfx_cp_init_microcode(adev, AMDGPU_UCODE_ID_CP_ME);



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

	err = request_firmware(&adev->gfx.ce_fw, fw_name, adev->dev);

	if (err)

		goto out;

	err = amdgpu_ucode_validate(adev->gfx.ce_fw);

	err = amdgpu_ucode_request(adev, &adev->gfx.ce_fw, fw_name);

	if (err)

		goto out;

	amdgpu_gfx_cp_init_microcode(adev, AMDGPU_UCODE_ID_CP_CE);



out:

	if (err) {

		dev_err(adev->dev,

			"gfx9: Failed to init firmware \"%s\"\n",

			fw_name);

		release_firmware(adev->gfx.pfp_fw);

		adev->gfx.pfp_fw = NULL;

		release_firmware(adev->gfx.me_fw);

		adev->gfx.me_fw = NULL;

		release_firmware(adev->gfx.ce_fw);

		adev->gfx.ce_fw = NULL;

		amdgpu_ucode_release(&adev->gfx.pfp_fw);

		amdgpu_ucode_release(&adev->gfx.me_fw);

		amdgpu_ucode_release(&adev->gfx.ce_fw);

	}

	return err;

}
@@ -1328,10 +1307,7 @@ static int gfx_v9_0_init_rlc_microcode(struct amdgpu_device *adev, 
		snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_kicker_rlc.bin", chip_name);

	else

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

	err = request_firmware(&adev->gfx.rlc_fw, fw_name, adev->dev);

	if (err)

		goto out;

	err = amdgpu_ucode_validate(adev->gfx.rlc_fw);

	err = amdgpu_ucode_request(adev, &adev->gfx.rlc_fw, fw_name);

	if (err)

		goto out;

	rlc_hdr = (const struct rlc_firmware_header_v2_0 *)adev->gfx.rlc_fw->data;
@@ -1340,13 +1316,9 @@ static int gfx_v9_0_init_rlc_microcode(struct amdgpu_device *adev, 
	version_minor = le16_to_cpu(rlc_hdr->header.header_version_minor);

	err = amdgpu_gfx_rlc_init_microcode(adev, version_major, version_minor);

out:

	if (err) {

		dev_err(adev->dev,

			"gfx9: Failed to init firmware \"%s\"\n",

			fw_name);

		release_firmware(adev->gfx.rlc_fw);

		adev->gfx.rlc_fw = NULL;

	}

	if (err)

		amdgpu_ucode_release(&adev->gfx.rlc_fw);



	return err;

}
@@ -1371,12 +1343,9 @@ static int gfx_v9_0_init_cp_compute_microcode(struct amdgpu_device *adev, 
	else

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



	err = request_firmware(&adev->gfx.mec_fw, fw_name, adev->dev);

	err = amdgpu_ucode_request(adev, &adev->gfx.mec_fw, fw_name);

	if (err)

		goto out;

	err = amdgpu_ucode_validate(adev->gfx.mec_fw);

	if (err)

		goto out;

		return err;

	amdgpu_gfx_cp_init_microcode(adev, AMDGPU_UCODE_ID_CP_MEC1);

	amdgpu_gfx_cp_init_microcode(adev, AMDGPU_UCODE_ID_CP_MEC1_JT);
@@ -1386,11 +1355,8 @@ static int gfx_v9_0_init_cp_compute_microcode(struct amdgpu_device *adev, 
		else

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



		err = request_firmware(&adev->gfx.mec2_fw, fw_name, adev->dev);

		err = amdgpu_ucode_request(adev, &adev->gfx.mec2_fw, fw_name);

		if (!err) {

			err = amdgpu_ucode_validate(adev->gfx.mec2_fw);

			if (err)

				goto out;

			amdgpu_gfx_cp_init_microcode(adev, AMDGPU_UCODE_ID_CP_MEC2);

			amdgpu_gfx_cp_init_microcode(adev, AMDGPU_UCODE_ID_CP_MEC2_JT);

		} else {
@@ -1402,17 +1368,11 @@ static int gfx_v9_0_init_cp_compute_microcode(struct amdgpu_device *adev, 
		adev->gfx.mec2_feature_version = adev->gfx.mec_feature_version;

	}



out:

	gfx_v9_0_check_if_need_gfxoff(adev);

	gfx_v9_0_check_fw_write_wait(adev);

	if (err) {

		dev_err(adev->dev,

			"gfx9: Failed to init firmware \"%s\"\n",

			fw_name);

		release_firmware(adev->gfx.mec_fw);

		adev->gfx.mec_fw = NULL;

		release_firmware(adev->gfx.mec2_fw);

		adev->gfx.mec2_fw = NULL;

		amdgpu_ucode_release(&adev->gfx.mec_fw);

		amdgpu_ucode_release(&adev->gfx.mec2_fw);

	}

	return err;

}