Commit e3558747 authored by Yuan Can's avatar Yuan Can Committed by Heiko Stuebner
Browse files

drm/rockchip: use pm_runtime_resume_and_get() instead of pm_runtime_get_sync() 



Replace pm_runtime_get_sync() with pm_runtime_resume_and_get() to avoid
device usage counter leak.

Signed-off-by: default avatarYuan Can <yuancan@huawei.com>
Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20220615062644.96837-1-yuancan@huawei.com
parent 3daf391f

drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c

+1 −1
Original line number Diff line number Diff line
@@ -1207,7 +1207,7 @@ static int dw_mipi_dsi_dphy_power_on(struct phy *phy) 
		return i;

	}



	ret = pm_runtime_get_sync(dsi->dev);

	ret = pm_runtime_resume_and_get(dsi->dev);

	if (ret < 0) {

		DRM_DEV_ERROR(dsi->dev, "failed to enable device: %d\n", ret);

		return ret;

drivers/gpu/drm/rockchip/rockchip_drm_vop.c

+2 −2
Original line number Diff line number Diff line
@@ -602,7 +602,7 @@ static int vop_enable(struct drm_crtc *crtc, struct drm_crtc_state *old_state) 
	struct vop *vop = to_vop(crtc);

	int ret, i;



	ret = pm_runtime_get_sync(vop->dev);

	ret = pm_runtime_resume_and_get(vop->dev);

	if (ret < 0) {

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

		return ret;
@@ -1983,7 +1983,7 @@ static int vop_initial(struct vop *vop) 
		return PTR_ERR(vop->dclk);

	}



	ret = pm_runtime_get_sync(vop->dev);

	ret = pm_runtime_resume_and_get(vop->dev);

	if (ret < 0) {

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

		return ret;

drivers/gpu/drm/rockchip/rockchip_drm_vop2.c

+1 −1
Original line number Diff line number Diff line
@@ -822,7 +822,7 @@ static void vop2_enable(struct vop2 *vop2) 
{

	int ret;



	ret = pm_runtime_get_sync(vop2->dev);

	ret = pm_runtime_resume_and_get(vop2->dev);

	if (ret < 0) {

		drm_err(vop2->drm, "failed to get pm runtime: %d\n", ret);

		return;