[PATCH 1/2] drm/amd/powerplay: fix a logic error in pp_hw_init

Alex Deucher alexdeucher at gmail.com
Sun Oct 1 21:24:20 UTC 2017


On Fri, Sep 29, 2017 at 10:50 PM, Rex Zhu <Rex.Zhu at amd.com> wrote:
> Change-Id: I8607e51a0e4153b36268e2bcf4fe594c2bfbfe23
> Signed-off-by: Rex Zhu <Rex.Zhu at amd.com>

Acked-by: Alex Deucher <alexander.deucher at amd.com>

> ---
>  drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 9 ++++-----
>  1 file changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/powerplay/amd_powerplay.c b/drivers/gpu/drm/amd/powerplay/amd_powerplay.c
> index df70cc7..586cab7 100644
> --- a/drivers/gpu/drm/amd/powerplay/amd_powerplay.c
> +++ b/drivers/gpu/drm/amd/powerplay/amd_powerplay.c
> @@ -163,12 +163,11 @@ static int pp_hw_init(void *handle)
>                 }
>                 if (ret == PP_DPM_DISABLED)
>                         goto exit;
> +               ret = hwmgr_hw_init(pp_handle);
> +               if (ret)
> +                       goto exit;
>         }
> -
> -       ret = hwmgr_hw_init(pp_handle);
> -       if (ret)
> -               goto exit;
> -       return 0;
> +       return ret;
>  exit:
>         pp_handle->pm_en = 0;
>         cgs_notify_dpm_enabled(hwmgr->device, false);
> --
> 1.9.1
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx


More information about the amd-gfx mailing list