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

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



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 39d3649b

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

+17 −51
Original line number Diff line number Diff line
@@ -887,6 +887,16 @@ static void gfx_v7_0_get_csb_buffer(struct amdgpu_device *adev, volatile u32 *bu 
static void gfx_v7_0_init_pg(struct amdgpu_device *adev);

static void gfx_v7_0_get_cu_info(struct amdgpu_device *adev);



static void gfx_v7_0_free_microcode(struct amdgpu_device *adev)

{

	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.mec_fw);

	amdgpu_ucode_release(&adev->gfx.mec2_fw);

	amdgpu_ucode_release(&adev->gfx.rlc_fw);

}



/*

 * Core functions

 */
@@ -927,88 +937,44 @@ static int gfx_v7_0_init_microcode(struct amdgpu_device *adev) 
	}



	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;



	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;



	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;



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

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

	if (err)

		goto out;

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

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

	if (err)

		goto out;



	if (adev->asic_type == CHIP_KAVERI) {

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

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

		if (err)

			goto out;

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

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

		if (err)

			goto out;

	}



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

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

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

	if (err)

		goto out;

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



out:

	if (err) {

		pr_err("gfx7: Failed to load 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;

		release_firmware(adev->gfx.mec_fw);

		adev->gfx.mec_fw = NULL;

		release_firmware(adev->gfx.mec2_fw);

		adev->gfx.mec2_fw = NULL;

		release_firmware(adev->gfx.rlc_fw);

		adev->gfx.rlc_fw = NULL;

		gfx_v7_0_free_microcode(adev);

	}

	return err;

}



static void gfx_v7_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.mec_fw);

	adev->gfx.mec_fw = NULL;

	release_firmware(adev->gfx.mec2_fw);

	adev->gfx.mec2_fw = NULL;

	release_firmware(adev->gfx.rlc_fw);

	adev->gfx.rlc_fw = NULL;

}



/**

 * gfx_v7_0_tiling_mode_table_init - init the hw tiling table

 *