Commit 7091b60c authored by Hawking Zhang's avatar Hawking Zhang Committed by Alex Deucher
Browse files

drm/amdgpu: load np fw prior before loading the TAs 



Platform TAs will independently toggle DF Cstate.
for instance, get/set topology from xgmi ta. do error
injection from ras ta. In such case, PMFW needs to be
loaded before TAs so that all the subsequent Cstate
calls recieved by PSP FW can be routed to PMFW.

Signed-off-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Acked-by: default avatarEvan Quan <evan.quan@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 71e5f0cb

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

+33 −33
Original line number Diff line number Diff line
@@ -1231,39 +1231,6 @@ static int psp_hw_start(struct psp_context *psp) 
		return ret;

	}



	ret = psp_asd_load(psp);

	if (ret) {

		DRM_ERROR("PSP load asd failed!\n");

		return ret;

	}



	if (adev->gmc.xgmi.num_physical_nodes > 1) {

		ret = psp_xgmi_initialize(psp);

		/* Warning the XGMI seesion initialize failure

		 * Instead of stop driver initialization

		 */

		if (ret)

			dev_err(psp->adev->dev,

				"XGMI: Failed to initialize XGMI session\n");

	}



	if (psp->adev->psp.ta_fw) {

		ret = psp_ras_initialize(psp);

		if (ret)

			dev_err(psp->adev->dev,

					"RAS: Failed to initialize RAS\n");



		ret = psp_hdcp_initialize(psp);

		if (ret)

			dev_err(psp->adev->dev,

				"HDCP: Failed to initialize HDCP\n");



		ret = psp_dtm_initialize(psp);

		if (ret)

			dev_err(psp->adev->dev,

				"DTM: Failed to initialize DTM\n");

	}



	return 0;

}
@@ -1579,6 +1546,39 @@ skip_memalloc: 
	if (ret)

		goto failed;



	ret = psp_asd_load(psp);

	if (ret) {

		DRM_ERROR("PSP load asd failed!\n");

		return ret;

	}



	if (adev->gmc.xgmi.num_physical_nodes > 1) {

		ret = psp_xgmi_initialize(psp);

		/* Warning the XGMI seesion initialize failure

		 * Instead of stop driver initialization

		 */

		if (ret)

			dev_err(psp->adev->dev,

				"XGMI: Failed to initialize XGMI session\n");

	}



	if (psp->adev->psp.ta_fw) {

		ret = psp_ras_initialize(psp);

		if (ret)

			dev_err(psp->adev->dev,

					"RAS: Failed to initialize RAS\n");



		ret = psp_hdcp_initialize(psp);

		if (ret)

			dev_err(psp->adev->dev,

				"HDCP: Failed to initialize HDCP\n");



		ret = psp_dtm_initialize(psp);

		if (ret)

			dev_err(psp->adev->dev,

				"DTM: Failed to initialize DTM\n");

	}



	return 0;



failed:

CRA Git | Maintained and supported by SUSTech CRA and CCSE