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

drm/amd: Load VCN microcode during early_init 



Simplifies the code so that all VCN versions will get the firmware
name from `amdgpu_ucode_ip_version_decode` and then use this filename
to load microcode as part of the early_init process.

Reviewed-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 33efaf82

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

+15 −38
Original line number Diff line number Diff line
@@ -80,10 +80,24 @@ MODULE_FIRMWARE(FIRMWARE_VCN4_0_4); 


static void amdgpu_vcn_idle_work_handler(struct work_struct *work);



int amdgpu_vcn_early_init(struct amdgpu_device *adev)

{

	char ucode_prefix[30];

	char fw_name[40];

	int r;



	amdgpu_ucode_ip_version_decode(adev, UVD_HWIP, ucode_prefix, sizeof(ucode_prefix));

	snprintf(fw_name, sizeof(fw_name), "amdgpu/%s.bin", ucode_prefix);

	r = amdgpu_ucode_request(adev, &adev->vcn.fw, fw_name);

	if (r)

		amdgpu_ucode_release(&adev->vcn.fw);



	return r;

}



int amdgpu_vcn_sw_init(struct amdgpu_device *adev)

{

	unsigned long bo_size;

	const char *fw_name;

	const struct common_firmware_header *hdr;

	unsigned char fw_check;

	unsigned int fw_shared_size, log_offset;
@@ -99,46 +113,27 @@ int amdgpu_vcn_sw_init(struct amdgpu_device *adev) 
	switch (adev->ip_versions[UVD_HWIP][0]) {

	case IP_VERSION(1, 0, 0):

	case IP_VERSION(1, 0, 1):

		if (adev->apu_flags & AMD_APU_IS_RAVEN2)

			fw_name = FIRMWARE_RAVEN2;

		else if (adev->apu_flags & AMD_APU_IS_PICASSO)

			fw_name = FIRMWARE_PICASSO;

		else

			fw_name = FIRMWARE_RAVEN;

		break;

	case IP_VERSION(2, 5, 0):

		fw_name = FIRMWARE_ARCTURUS;

		if ((adev->firmware.load_type == AMDGPU_FW_LOAD_PSP) &&

		    (adev->pg_flags & AMD_PG_SUPPORT_VCN_DPG))

			adev->vcn.indirect_sram = true;

		break;

	case IP_VERSION(2, 2, 0):

		if (adev->apu_flags & AMD_APU_IS_RENOIR)

			fw_name = FIRMWARE_RENOIR;

		else

			fw_name = FIRMWARE_GREEN_SARDINE;



		if ((adev->firmware.load_type == AMDGPU_FW_LOAD_PSP) &&

		    (adev->pg_flags & AMD_PG_SUPPORT_VCN_DPG))

			adev->vcn.indirect_sram = true;

		break;

	case IP_VERSION(2, 6, 0):

		fw_name = FIRMWARE_ALDEBARAN;

		if ((adev->firmware.load_type == AMDGPU_FW_LOAD_PSP) &&

		    (adev->pg_flags & AMD_PG_SUPPORT_VCN_DPG))

			adev->vcn.indirect_sram = true;

		break;

	case IP_VERSION(2, 0, 0):

		fw_name = FIRMWARE_NAVI10;

		if ((adev->firmware.load_type == AMDGPU_FW_LOAD_PSP) &&

		    (adev->pg_flags & AMD_PG_SUPPORT_VCN_DPG))

			adev->vcn.indirect_sram = true;

		break;

	case IP_VERSION(2, 0, 2):

		if (adev->asic_type == CHIP_NAVI12)

			fw_name = FIRMWARE_NAVI12;

		else

			fw_name = FIRMWARE_NAVI14;

		if ((adev->firmware.load_type == AMDGPU_FW_LOAD_PSP) &&

		    (adev->pg_flags & AMD_PG_SUPPORT_VCN_DPG))

			adev->vcn.indirect_sram = true;
@@ -146,58 +141,46 @@ int amdgpu_vcn_sw_init(struct amdgpu_device *adev) 
	case IP_VERSION(3, 0, 0):

	case IP_VERSION(3, 0, 64):

	case IP_VERSION(3, 0, 192):

		if (adev->ip_versions[GC_HWIP][0] == IP_VERSION(10, 3, 0))

			fw_name = FIRMWARE_SIENNA_CICHLID;

		else

			fw_name = FIRMWARE_NAVY_FLOUNDER;

		if ((adev->firmware.load_type == AMDGPU_FW_LOAD_PSP) &&

		    (adev->pg_flags & AMD_PG_SUPPORT_VCN_DPG))

			adev->vcn.indirect_sram = true;

		break;

	case IP_VERSION(3, 0, 2):

		fw_name = FIRMWARE_VANGOGH;

		if ((adev->firmware.load_type == AMDGPU_FW_LOAD_PSP) &&

		    (adev->pg_flags & AMD_PG_SUPPORT_VCN_DPG))

			adev->vcn.indirect_sram = true;

		break;

	case IP_VERSION(3, 0, 16):

		fw_name = FIRMWARE_DIMGREY_CAVEFISH;

		if ((adev->firmware.load_type == AMDGPU_FW_LOAD_PSP) &&

		    (adev->pg_flags & AMD_PG_SUPPORT_VCN_DPG))

			adev->vcn.indirect_sram = true;

		break;

	case IP_VERSION(3, 0, 33):

		fw_name = FIRMWARE_BEIGE_GOBY;

		if ((adev->firmware.load_type == AMDGPU_FW_LOAD_PSP) &&

		    (adev->pg_flags & AMD_PG_SUPPORT_VCN_DPG))

			adev->vcn.indirect_sram = true;

		break;

	case IP_VERSION(3, 1, 1):

		fw_name = FIRMWARE_YELLOW_CARP;

		if ((adev->firmware.load_type == AMDGPU_FW_LOAD_PSP) &&

		    (adev->pg_flags & AMD_PG_SUPPORT_VCN_DPG))

			adev->vcn.indirect_sram = true;

		break;

	case IP_VERSION(3, 1, 2):

		fw_name = FIRMWARE_VCN_3_1_2;

		if ((adev->firmware.load_type == AMDGPU_FW_LOAD_PSP) &&

		    (adev->pg_flags & AMD_PG_SUPPORT_VCN_DPG))

			adev->vcn.indirect_sram = true;

		break;

	case IP_VERSION(4, 0, 0):

		fw_name = FIRMWARE_VCN4_0_0;

		if ((adev->firmware.load_type == AMDGPU_FW_LOAD_PSP) &&

			(adev->pg_flags & AMD_PG_SUPPORT_VCN_DPG))

			adev->vcn.indirect_sram = true;

		break;

	case IP_VERSION(4, 0, 2):

		fw_name = FIRMWARE_VCN4_0_2;

		if ((adev->firmware.load_type == AMDGPU_FW_LOAD_PSP) &&

			(adev->pg_flags & AMD_PG_SUPPORT_VCN_DPG))

			adev->vcn.indirect_sram = true;

		break;

	case IP_VERSION(4, 0, 4):

		fw_name = FIRMWARE_VCN4_0_4;

		if ((adev->firmware.load_type == AMDGPU_FW_LOAD_PSP) &&

			(adev->pg_flags & AMD_PG_SUPPORT_VCN_DPG))

			adev->vcn.indirect_sram = true;
@@ -206,12 +189,6 @@ int amdgpu_vcn_sw_init(struct amdgpu_device *adev) 
		return -EINVAL;

	}



	r = amdgpu_ucode_request(adev, &adev->vcn.fw, fw_name);

	if (r) {

		amdgpu_ucode_release(&adev->vcn.fw);

		return r;

	}



	hdr = (const struct common_firmware_header *)adev->vcn.fw->data;

	adev->vcn.fw_version = le32_to_cpu(hdr->ucode_version);

drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h

+1 −0
Original line number Diff line number Diff line
@@ -369,6 +369,7 @@ enum vcn_ring_type { 
	VCN_UNIFIED_RING,

};



int amdgpu_vcn_early_init(struct amdgpu_device *adev);

int amdgpu_vcn_sw_init(struct amdgpu_device *adev);

int amdgpu_vcn_sw_fini(struct amdgpu_device *adev);

int amdgpu_vcn_suspend(struct amdgpu_device *adev);

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

+3 −2
Original line number Diff line number Diff line
@@ -57,11 +57,12 @@ static void vcn_v1_0_idle_work_handler(struct work_struct *work); 
static void vcn_v1_0_ring_begin_use(struct amdgpu_ring *ring);



/**

 * vcn_v1_0_early_init - set function pointers

 * vcn_v1_0_early_init - set function pointers and load microcode

 *

 * @handle: amdgpu_device pointer

 *

 * Set ring and irq function pointers

 * Load microcode from filesystem

 */

static int vcn_v1_0_early_init(void *handle)

{
@@ -75,7 +76,7 @@ static int vcn_v1_0_early_init(void *handle) 


	jpeg_v1_0_early_init(handle);



	return 0;

	return amdgpu_vcn_early_init(adev);

}



/**

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

+3 −2
Original line number Diff line number Diff line
@@ -62,11 +62,12 @@ static int vcn_v2_0_pause_dpg_mode(struct amdgpu_device *adev, 
				int inst_idx, struct dpg_pause_state *new_state);

static int vcn_v2_0_start_sriov(struct amdgpu_device *adev);

/**

 * vcn_v2_0_early_init - set function pointers

 * vcn_v2_0_early_init - set function pointers and load microcode

 *

 * @handle: amdgpu_device pointer

 *

 * Set ring and irq function pointers

 * Load microcode from filesystem

 */

static int vcn_v2_0_early_init(void *handle)

{
@@ -81,7 +82,7 @@ static int vcn_v2_0_early_init(void *handle) 
	vcn_v2_0_set_enc_ring_funcs(adev);

	vcn_v2_0_set_irq_funcs(adev);



	return 0;

	return amdgpu_vcn_early_init(adev);

}



/**

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

+3 −2
Original line number Diff line number Diff line
@@ -71,11 +71,12 @@ static int amdgpu_ih_clientid_vcns[] = { 
};



/**

 * vcn_v2_5_early_init - set function pointers

 * vcn_v2_5_early_init - set function pointers and load microcode

 *

 * @handle: amdgpu_device pointer

 *

 * Set ring and irq function pointers

 * Load microcode from filesystem

 */

static int vcn_v2_5_early_init(void *handle)

{
@@ -107,7 +108,7 @@ static int vcn_v2_5_early_init(void *handle) 
	vcn_v2_5_set_irq_funcs(adev);

	vcn_v2_5_set_ras_funcs(adev);



	return 0;

	return amdgpu_vcn_early_init(adev);

}



/**