diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3992-drm-amd-powerplay-unlock-on-error-in-smu_resume.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3992-drm-amd-powerplay-unlock-on-error-in-smu_resume.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3992-drm-amd-powerplay-unlock-on-error-in-smu_resume.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3992-drm-amd-powerplay-unlock-on-error-in-smu_resume.patch new file mode 100644 index 00000000..93f276ed --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3992-drm-amd-powerplay-unlock-on-error-in-smu_resume.patch @@ -0,0 +1,31 @@ +From 87a0ac5da5aea95ee0936f90a0c8ee3f43f9a594 Mon Sep 17 00:00:00 2001 +From: Dan Carpenter <dan.carpenter@oracle.com> +Date: Mon, 7 Oct 2019 12:04:54 +0300 +Subject: [PATCH 3992/4256] drm/amd/powerplay: unlock on error in smu_resume() + +This function needs to drop the mutex before returning. + +Fixes: f7e3a5776fa6 ("drm/amd/powerplay: check SMU engine readiness before proceeding on S3 resume") +Reviewed-by: Kevin Wang <kevin1.wang@amd.com> +Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +index c63b2a9902de..88d7376aee71 100644 +--- a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c ++++ b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +@@ -1384,7 +1384,7 @@ static int smu_resume(void *handle) + ret = smu_start_smc_engine(smu); + if (ret) { + pr_err("SMU is not ready yet!\n"); +- return ret; ++ goto failed; + } + + ret = smu_smc_table_hw_init(smu, false); +-- +2.17.1 + |