lkml.org 
[lkml]   [2020]   [Apr]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.6 031/149] drm/tegra: dc: Release PM and RGB output when client's registration fails
    Date
    From: Dmitry Osipenko <digetx@gmail.com>

    [ Upstream commit 0411ea89a689531e1829fdf8af3747646c02c721 ]

    Runtime PM and RGB output need to be released when host1x client
    registration fails. The releasing is missed in the code, let's correct it.

    Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
    Signed-off-by: Thierry Reding <treding@nvidia.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/gpu/drm/tegra/dc.c | 8 +++++++-
    1 file changed, 7 insertions(+), 1 deletion(-)

    diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c
    index 7c70fd31a4c24..870f9a68ad2c5 100644
    --- a/drivers/gpu/drm/tegra/dc.c
    +++ b/drivers/gpu/drm/tegra/dc.c
    @@ -2588,10 +2588,16 @@ static int tegra_dc_probe(struct platform_device *pdev)
    if (err < 0) {
    dev_err(&pdev->dev, "failed to register host1x client: %d\n",
    err);
    - return err;
    + goto disable_pm;
    }

    return 0;
    +
    +disable_pm:
    + pm_runtime_disable(&pdev->dev);
    + tegra_dc_rgb_remove(dc);
    +
    + return err;
    }

    static int tegra_dc_remove(struct platform_device *pdev)
    --
    2.20.1
    \
     
     \ /
      Last update: 2020-04-12 01:49    [W:3.083 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site