From 6728fc2ab33cec77ad4c54bd4447de16941bb28f Mon Sep 17 00:00:00 2001 From: Damon Ding Date: Tue, 2 Apr 2024 19:55:33 +0800 Subject: [PATCH] drm/rockchip: vop2: not to request late resume in loader protect There is no need to call .resume() in switching between uboot logo and kernel logo. Fixes: 037df56ef7c3 ("drm/rockchip: vop2: Add support to request early supend") Change-Id: I3da95e20726893412386cd414f9a4fd38724d0f0 Signed-off-by: Damon Ding --- drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c index 9a37ee6eb28d..50d87c3abe8f 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c @@ -2213,11 +2213,6 @@ static void vop2_set_system_status(struct vop2 *vop2) rockchip_set_system_status(SYS_STATUS_DUALVIEW); else rockchip_clear_system_status(SYS_STATUS_DUALVIEW); - - if (hweight8(vop2->active_vp_mask)) - rockchip_request_late_resume(); - else - rockchip_request_early_suspend(); } static bool vop2_win_rb_swap(uint32_t format) @@ -4920,6 +4915,8 @@ static void vop2_crtc_atomic_disable(struct drm_crtc *crtc, vop2_unlock(vop2); vop2_set_system_status(vop2); + if (!vop2->active_vp_mask) + rockchip_request_early_suspend(); out: if (crtc->state->event && !crtc->state->active) { @@ -8627,6 +8624,7 @@ static void vop2_crtc_atomic_enable(struct drm_crtc *crtc, struct drm_atomic_sta vop2->active_vp_mask |= BIT(vp->id); vop2_set_system_status(vop2); + rockchip_request_late_resume(); vop2_lock(vop2); DRM_DEV_INFO(vop2->dev, "Update mode to %dx%d%s%d, type: %d(if:%x, flag:0x%x) for vp%d dclk: %llu\n",