drm/amdgpu: retire legacy vega10 sos version check (e748f07d) · Commits · 戴 / test

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

+1 −27

Original line number	Diff line number	Diff line
		@@ -50,8 +50,6 @@ MODULE_FIRMWARE("amdgpu/vega12_asd.bin");

		#define smnMP1_FIRMWARE_FLAGS 0x3010028

		static uint32_t sos_old_versions[] = {1517616, 1510592, 1448594, 1446554};

		static int psp_v3_1_ring_stop(struct psp_context *psp,
		enum psp_ring_type ring_type);

		@@ -125,31 +123,12 @@ static int psp_v3_1_bootloader_load_sysdrv(struct psp_context *psp)
		return ret;
		}

		static bool psp_v3_1_match_version(struct amdgpu_device *adev, uint32_t ver)
		{
		int i;

		if (ver == adev->psp.sos_fw_version)
		return true;

		/*
		* Double check if the latest four legacy versions.
		* If yes, it is still the right version.
		*/
		for (i = 0; i < ARRAY_SIZE(sos_old_versions); i++) {
		if (sos_old_versions[i] == adev->psp.sos_fw_version)
		return true;
		}

		return false;
		}

		static int psp_v3_1_bootloader_load_sos(struct psp_context *psp)
		{
		int ret;
		unsigned int psp_gfxdrv_command_reg = 0;
		struct amdgpu_device *adev = psp->adev;
		uint32_t sol_reg, ver;
		uint32_t sol_reg;

		/* Check sOS sign of life register to confirm sys driver and sOS
		* are already been loaded.
		@@ -181,11 +160,6 @@ static int psp_v3_1_bootloader_load_sos(struct psp_context *psp)
		ret = psp_wait_for(psp, SOC15_REG_OFFSET(MP0, 0, mmMP0_SMN_C2PMSG_81),
		RREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_81),
		0, true);

		ver = RREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_58);
		if (!psp_v3_1_match_version(adev, ver))
		DRM_WARN("SOS version doesn't match\n");

		return ret;
		}