[PATCH] drm/meson: pm resume add return errno branch

Neil Armstrong narmstrong at baylibre.com
Wed May 13 14:27:53 UTC 2020


On 28/04/2020 15:17, Bernard Zhao wrote:
> pm_resump api did not handle drm_mode_config_helper_resume error.
> This change add handle to return drm_mode_config_helper_resume`s
> error number. This code logic is aligned with api pm_suspend.
> After this change, the code maybe a bit readable.
> 
> Signed-off-by: Bernard Zhao <bernard at vivo.com>
> ---
>  drivers/gpu/drm/meson/meson_drv.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/meson/meson_drv.c b/drivers/gpu/drm/meson/meson_drv.c
> index b5f5eb7b4bb9..8c2e1b47e81a 100644
> --- a/drivers/gpu/drm/meson/meson_drv.c
> +++ b/drivers/gpu/drm/meson/meson_drv.c
> @@ -412,9 +412,7 @@ static int __maybe_unused meson_drv_pm_resume(struct device *dev)
>  	if (priv->afbcd.ops)
>  		priv->afbcd.ops->init(priv);
>  
> -	drm_mode_config_helper_resume(priv->drm);
> -
> -	return 0;
> +	return drm_mode_config_helper_resume(priv->drm);
>  }
>  
>  static int compare_of(struct device *dev, void *data)
> 

Applied to drm-misc-fixes

Thanks,
Neil


More information about the dri-devel mailing list