Commit 4dba27f1 authored by Zhang Qilong's avatar Zhang Qilong Committed by Heiko Stuebner
Browse files

drm/rockchip: lvds: fix PM usage counter unbalance in poweron 



pm_runtime_get_sync will increment pm usage counter even it failed.
Forgetting to putting operation will result in reference leak here.
We fix it by replacing it with the newest pm_runtime_resume_and_get
to keep usage counter balanced.

Fixes: 34cc0aa2 ("drm/rockchip: Add support for Rockchip Soc LVDS")
Fixes: cca1705c ("drm/rockchip: lvds: Add PX30 support")
Signed-off-by: default avatarZhang Qilong <zhangqilong3@huawei.com>
Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20220922132107.105419-3-zhangqilong3@huawei.com
parent e3558747

drivers/gpu/drm/rockchip/rockchip_lvds.c

+7 −3
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ static int rk3288_lvds_poweron(struct rockchip_lvds *lvds) 
		DRM_DEV_ERROR(lvds->dev, "failed to enable lvds pclk %d\n", ret);

		return ret;

	}

	ret = pm_runtime_get_sync(lvds->dev);

	ret = pm_runtime_resume_and_get(lvds->dev);

	if (ret < 0) {

		DRM_DEV_ERROR(lvds->dev, "failed to get pm runtime: %d\n", ret);

		clk_disable(lvds->pclk);
@@ -336,16 +336,20 @@ static int px30_lvds_poweron(struct rockchip_lvds *lvds) 
{

	int ret;



	ret = pm_runtime_get_sync(lvds->dev);

	ret = pm_runtime_resume_and_get(lvds->dev);

	if (ret < 0) {

		DRM_DEV_ERROR(lvds->dev, "failed to get pm runtime: %d\n", ret);

		return ret;

	}



	/* Enable LVDS mode */

	return regmap_update_bits(lvds->grf, PX30_LVDS_GRF_PD_VO_CON1,

	ret = regmap_update_bits(lvds->grf, PX30_LVDS_GRF_PD_VO_CON1,

				  PX30_LVDS_MODE_EN(1) | PX30_LVDS_P2S_EN(1),

				  PX30_LVDS_MODE_EN(1) | PX30_LVDS_P2S_EN(1));

	if (ret)

		pm_runtime_put(lvds->dev);



	return ret;

}



static void px30_lvds_poweroff(struct rockchip_lvds *lvds)