diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4719-drm-amdgpu-fix-resume-failures-due-to-psp-fw-loading.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4719-drm-amdgpu-fix-resume-failures-due-to-psp-fw-loading.patch | 68 |
1 files changed, 68 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4719-drm-amdgpu-fix-resume-failures-due-to-psp-fw-loading.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4719-drm-amdgpu-fix-resume-failures-due-to-psp-fw-loading.patch new file mode 100644 index 00000000..6fb07e55 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4719-drm-amdgpu-fix-resume-failures-due-to-psp-fw-loading.patch @@ -0,0 +1,68 @@ +From 167d845d08e4d436ea15f98bce4ccc24aecad582 Mon Sep 17 00:00:00 2001 +From: Hawking Zhang <Hawking.Zhang@amd.com> +Date: Fri, 6 Dec 2019 18:09:19 +0800 +Subject: [PATCH 4719/4736] drm/amdgpu: fix resume failures due to psp fw + loading sequence change (v3) + +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> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 33 +++++++++++++++++++++++++ + 1 file changed, 33 insertions(+) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +index 728f53ea2ad6..9b869fa9b594 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +@@ -1723,6 +1723,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; +-- +2.17.1 + |