drm/amdgpu: fix resume failures due to psp fw loading sequence change (v3) (0d6f39bb) · Commits · 戴 / test

this fix the regression caused by asd/ta loading sequence adjustment recently. asd/ta loading was move out from hw_start and should also be applied to psp_resume. otherwise those fw loading will be ignored in resume phase. v2: add the mutex unlock for asd loading failure case v3: merge the error handling to failed tag Signed-off-by:

Hawking Zhang <Hawking.Zhang@amd.com> Reviewed-by:

Guchun Chen <guchun.chen@amd.com> Reviewed-by:

Le Ma <Le.Ma@amd.com> Signed-off-by:

Alex Deucher <alexander.deucher@amd.com>

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

+33 −0

Original line number	Diff line number	Diff line
		@@ -1721,6 +1721,39 @@ static int psp_resume(void *handle)
		if (ret)
		goto failed;

		ret = psp_asd_load(psp);
		if (ret) {
		DRM_ERROR("PSP load asd failed!\n");
		goto failed;
		}

		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");
		}

		mutex_unlock(&adev->firmware.mutex);

		return 0;

Admin message