lkml.org 
[lkml]   [2020]   [Jun]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.6 282/606] drm/meson: pm resume add return errno branch
    Date
    From: Bernard Zhao <bernard@vivo.com>

    [ Upstream commit c54a8f1f329197d83d941ad84c4aa38bf282cbbd ]

    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@vivo.com>
    Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
    Link: https://patchwork.freedesktop.org/patch/msgid/20200428131747.2099-1-bernard@vivo.com
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    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)
    --
    2.25.1
    \
     
     \ /
      Last update: 2020-06-09 01:23    [W:4.185 / U:0.104 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site