From c4a31b3e3ab803b3fec61f30c62b8aa097088092 Mon Sep 17 00:00:00 2001 From: Zhang Yubing Date: Tue, 18 Apr 2023 14:19:35 +0800 Subject: [PATCH] drm/rockchip: vop2: power on esmart pd without ref count Fixes: b06e7b839cf1 ("drm/rockchip: vop2: fix esmart pd turn off timeout issue") Signed-off-by: Zhang Yubing Change-Id: I841f74108506a9c69b57edcff73380be35c33576 --- drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c index 5b6a78cb62d2..436fd06d9dbd 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c @@ -3827,10 +3827,10 @@ static void vop2_initial(struct drm_crtc *crtc) VOP_CTRL_SET(vop2, if_ctrl_cfg_done_imd, 1); /* Close dynamic turn on/off rk3588 PD_ESMART and keep esmart pd on when enable */ - if (vop2->version == VOP_VERSION_RK3588) { + if (!vp->loader_protect && vop2->version == VOP_VERSION_RK3588) { struct vop2_power_domain *esmart_pd = vop2_find_pd_by_id(vop2, VOP2_PD_ESMART); - vop2_power_domain_get(esmart_pd); + vop2_power_domain_on(esmart_pd); } vop2_layer_map_initial(vop2, current_vp_id); vop2_axi_irqs_enable(vop2);