[PATCH] drm/amd/powerplay: unlock on error in smu_resume()

[Alex Deucher]

Applied.  thanks!

Alex

On Mon, Oct 7, 2019 at 6:29 AM Wang, Kevin(Yang) <Kevin1.Wang at amd.com> wrote:
>
> Reviewed-by: Kevin Wang <kevin1.wang at amd.com>
>
> Best Regards,
> Kevin
> ________________________________
> From: amd-gfx <amd-gfx-bounces at lists.freedesktop.org> on behalf of Dan Carpenter <dan.carpenter at oracle.com>
> Sent: Monday, October 7, 2019 5:04 PM
> To: Rex Zhu <rex.zhu at amd.com>; Quan, Evan <Evan.Quan at amd.com>
> Cc: Zhou, David(ChunMing) <David1.Zhou at amd.com>; David Airlie <airlied at linux.ie>; kernel-janitors at vger.kernel.org <kernel-janitors at vger.kernel.org>; amd-gfx at lists.freedesktop.org <amd-gfx at lists.freedesktop.org>; dri-devel at lists.freedesktop.org <dri-devel at lists.freedesktop.org>; Daniel Vetter <daniel at ffwll.ch>; Deucher, Alexander <Alexander.Deucher at amd.com>; Koenig, Christian <Christian.Koenig at amd.com>
> Subject: [PATCH] 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")
> Signed-off-by: Dan Carpenter <dan.carpenter at oracle.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 6a64f765fcd4..f1fbbc8b77ee 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.20.1
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
> _______________________________________________
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel