Commit c5dd5667 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu: Consolidate VCN firmware setup code 



Roughly the same code was present in all VCN versions.
Consolidate it into a single function.

v2: use AMDGPU_UCODE_ID_VCN + i, check if num_inst >= 2

Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarLeo Liu <leo.liu@amd.com>
Reviewed-by: default avatarJames Zhu <James.Zhu@amd.com>
parent e8ac9e93

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

+27 −0
Original line number Diff line number Diff line
@@ -949,3 +949,30 @@ enum amdgpu_ring_priority_level amdgpu_vcn_get_enc_ring_prio(int ring) 
		return AMDGPU_RING_PRIO_0;

	}

}



void amdgpu_vcn_setup_ucode(struct amdgpu_device *adev)

{

	int i;

	unsigned int idx;



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

		const struct common_firmware_header *hdr;

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



		for (i = 0; i < adev->vcn.num_vcn_inst; i++) {

			if (adev->vcn.harvest_config & (1 << i))

				continue;

			/* currently only support 2 FW instances */

			if (i >= 2) {

				dev_info(adev->dev, "More then 2 VCN FW instances!\n");

				break;

			}

			idx = AMDGPU_UCODE_ID_VCN + i;

			adev->firmware.ucode[idx].ucode_id = idx;

			adev->firmware.ucode[idx].fw = adev->vcn.fw;

			adev->firmware.fw_size +=

				ALIGN(le32_to_cpu(hdr->ucode_size_bytes), PAGE_SIZE);

		}

		dev_info(adev->dev, "Will use PSP to load VCN firmware\n");

	}

}

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

+2 −0
Original line number Diff line number Diff line
@@ -310,4 +310,6 @@ int amdgpu_vcn_enc_ring_test_ib(struct amdgpu_ring *ring, long timeout); 


enum amdgpu_ring_priority_level amdgpu_vcn_get_enc_ring_prio(int ring);



void amdgpu_vcn_setup_ucode(struct amdgpu_device *adev);



#endif

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

+1 −9
Original line number Diff line number Diff line
@@ -111,15 +111,7 @@ static int vcn_v1_0_sw_init(void *handle) 
	/* Override the work func */

	adev->vcn.idle_work.work.func = vcn_v1_0_idle_work_handler;



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

		const struct common_firmware_header *hdr;

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

		adev->firmware.ucode[AMDGPU_UCODE_ID_VCN].ucode_id = AMDGPU_UCODE_ID_VCN;

		adev->firmware.ucode[AMDGPU_UCODE_ID_VCN].fw = adev->vcn.fw;

		adev->firmware.fw_size +=

			ALIGN(le32_to_cpu(hdr->ucode_size_bytes), PAGE_SIZE);

		dev_info(adev->dev, "Will use PSP to load VCN firmware\n");

	}

	amdgpu_vcn_setup_ucode(adev);



	r = amdgpu_vcn_resume(adev);

	if (r)

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

+1 −9
Original line number Diff line number Diff line
@@ -115,15 +115,7 @@ static int vcn_v2_0_sw_init(void *handle) 
	if (r)

		return r;



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

		const struct common_firmware_header *hdr;

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

		adev->firmware.ucode[AMDGPU_UCODE_ID_VCN].ucode_id = AMDGPU_UCODE_ID_VCN;

		adev->firmware.ucode[AMDGPU_UCODE_ID_VCN].fw = adev->vcn.fw;

		adev->firmware.fw_size +=

			ALIGN(le32_to_cpu(hdr->ucode_size_bytes), PAGE_SIZE);

		dev_info(adev->dev, "Will use PSP to load VCN firmware\n");

	}

	amdgpu_vcn_setup_ucode(adev);



	r = amdgpu_vcn_resume(adev);

	if (r)

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

+1 −16
Original line number Diff line number Diff line
@@ -139,22 +139,7 @@ static int vcn_v2_5_sw_init(void *handle) 
	if (r)

		return r;



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

		const struct common_firmware_header *hdr;

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

		adev->firmware.ucode[AMDGPU_UCODE_ID_VCN].ucode_id = AMDGPU_UCODE_ID_VCN;

		adev->firmware.ucode[AMDGPU_UCODE_ID_VCN].fw = adev->vcn.fw;

		adev->firmware.fw_size +=

			ALIGN(le32_to_cpu(hdr->ucode_size_bytes), PAGE_SIZE);



		if (adev->vcn.num_vcn_inst == VCN25_MAX_HW_INSTANCES_ARCTURUS) {

			adev->firmware.ucode[AMDGPU_UCODE_ID_VCN1].ucode_id = AMDGPU_UCODE_ID_VCN1;

			adev->firmware.ucode[AMDGPU_UCODE_ID_VCN1].fw = adev->vcn.fw;

			adev->firmware.fw_size +=

				ALIGN(le32_to_cpu(hdr->ucode_size_bytes), PAGE_SIZE);

		}

		dev_info(adev->dev, "Will use PSP to load VCN firmware\n");

	}

	amdgpu_vcn_setup_ucode(adev);



	r = amdgpu_vcn_resume(adev);

	if (r)