Commit 09eb3ea3 authored by Guilherme G. Piccoli's avatar Guilherme G. Piccoli Committed by Alex Deucher
Browse files

drm/amdgpu/vcn: Remove redundant indirect SRAM HW model check 



The HW model validation that guards the indirect SRAM checking in the
VCN code path is redundant - there's no model that's not included in the
switch, making it useless in practice [0].

So, let's remove this switch statement for good.

[0] lore.kernel.org/amd-gfx/MN0PR12MB61013D20B8A2263B22AE1BCFE2C19@MN0PR12MB6101.namprd12.prod.outlook.com

Suggested-by: default avatarAlex Deucher <Alexander.Deucher@amd.com>
Reviewed-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Cc: James Zhu <James.Zhu@amd.com>
Cc: Lazar Lijo <Lijo.Lazar@amd.com>
Cc: Leo Liu <leo.liu@amd.com>
Cc: Sonny Jiang <sonny.jiang@amd.com>
Signed-off-by: default avatarGuilherme G. Piccoli <gpiccoli@igalia.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 2ed9e22e

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

+3 −78
Original line number Diff line number Diff line
@@ -110,84 +110,9 @@ int amdgpu_vcn_sw_init(struct amdgpu_device *adev) 
	for (i = 0; i < adev->vcn.num_vcn_inst; i++)

		atomic_set(&adev->vcn.inst[i].dpg_enc_submission_cnt, 0);



	switch (adev->ip_versions[UVD_HWIP][0]) {

	case IP_VERSION(1, 0, 0):

	case IP_VERSION(1, 0, 1):

	case IP_VERSION(2, 5, 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(2, 2, 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(2, 6, 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(2, 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(2, 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(3, 0, 0):

	case IP_VERSION(3, 0, 64):

	case IP_VERSION(3, 0, 192):

		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):

		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):

		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):

		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):

		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):

		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):

		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):

		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):

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

			(adev->pg_flags & AMD_PG_SUPPORT_VCN_DPG))

			adev->vcn.indirect_sram = true;

		break;

	default:

		return -EINVAL;

	}



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

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