From f95824d0ec14fe937b5f7dcaab6a0d2535915f46 Mon Sep 17 00:00:00 2001 From: Steve Cohen Date: Mon, 13 Apr 2020 20:38:20 -0400 Subject: [PATCH] disp: msm: sde: restart idle power collapse timeout every kickoff Restart the timeline for the idle power collapse delayed work timer for every resource control kickoff instead of only during a power state change. This will prevent entering mode2 at unexpected times during active scanouts. Change-Id: I001157ff7e6b6246e26d537e30d8617cab9cb463 Signed-off-by: Steve Cohen --- msm/sde/sde_encoder.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/msm/sde/sde_encoder.c b/msm/sde/sde_encoder.c index 144f2339f97d..7c9ee432b0b3 100644 --- a/msm/sde/sde_encoder.c +++ b/msm/sde/sde_encoder.c @@ -1644,9 +1644,10 @@ static int _sde_encoder_rc_kickoff(struct drm_encoder *drm_enc, SDE_ENC_RC_STATE_ON, SDE_EVTLOG_FUNC_CASE1); sde_enc->rc_state = SDE_ENC_RC_STATE_ON; +end: /* restart delayed off work, if required */ _sde_encoder_rc_restart_delayed(sde_enc, sw_event); -end: + mutex_unlock(&sde_enc->rc_lock); return ret; }