From fb8235db1b61dc184ae508534c0c48dcacbf1d70 Mon Sep 17 00:00:00 2001 From: Nilaan Gunabalachandran Date: Mon, 14 Jun 2021 13:41:06 -0400 Subject: [PATCH] disp: msm: sde: poll for rsvp nxt after idle During mode enable after idle, rsvp next would be set without rsvp cur. Back to back test only should be serialized, but currently this would be possible right after idle. This is established by commit 11aab5f9c382 ("disp: msm: sde: Fix null dereference errors"). This change updates the condition to poll for rsvp next clear during this usecase as well. Change-Id: I300254967cbec69fff8b31545b8d659afc56f283 Signed-off-by: Nilaan Gunabalachandran --- msm/sde/sde_rm.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/msm/sde/sde_rm.c b/msm/sde/sde_rm.c index f5221aae3f26..f9e7fd9ebf35 100644 --- a/msm/sde/sde_rm.c +++ b/msm/sde/sde_rm.c @@ -2453,11 +2453,14 @@ int sde_rm_reserve( * Poll for rsvp_nxt clear, allow the check_only commit if rsvp_nxt * gets cleared and bailout if it does not get cleared before timeout. */ - if (test_only && rsvp_cur && rsvp_nxt) { + if (test_only && rsvp_nxt) { rsvp_nxt = _sde_rm_poll_get_rsvp_nxt_locked(rm, enc); if (rsvp_nxt) { SDE_ERROR("poll timeout cur %d nxt %d enc %d\n", - rsvp_cur->seq, rsvp_nxt->seq, enc->base.id); + (rsvp_cur) ? rsvp_cur->seq : -1, + rsvp_nxt->seq, enc->base.id); + SDE_EVT32(enc->base.id, (rsvp_cur) ? rsvp_cur->seq : -1, + rsvp_nxt->seq, SDE_EVTLOG_ERROR); ret = -EINVAL; goto end; }