disp: msm: sde: poll for rsvp nxt after idle

During mode enable after idle, rsvp next would be 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 11aab5f9c3 (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 <ngunabal@codeaurora.org>
此提交包含在:
Nilaan Gunabalachandran
2021-06-14 13:41:06 -04:00
父節點 eacfafbaed
當前提交 ab52bfd181

查看文件

@@ -2546,12 +2546,14 @@ int sde_rm_reserve(
* Poll for rsvp_nxt clear, allow the check_only commit if rsvp_nxt * 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. * 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); rsvp_nxt = _sde_rm_poll_get_rsvp_nxt_locked(rm, enc);
if (rsvp_nxt) { if (rsvp_nxt) {
pr_err("poll timeout cur %d nxt %d enc %d\n", pr_err("poll timeout cur %d nxt %d enc %d\n",
rsvp_cur->seq, rsvp_nxt->seq, enc->base.id); (rsvp_cur) ? rsvp_cur->seq : -1,
SDE_EVT32(enc->base.id, rsvp_cur->seq, rsvp_nxt->seq, SDE_EVTLOG_ERROR); rsvp_nxt->seq, enc->base.id);
SDE_EVT32(enc->base.id, (rsvp_cur) ? rsvp_cur->seq : -1,
rsvp_nxt->seq, SDE_EVTLOG_ERROR);
ret = -EAGAIN; ret = -EAGAIN;
goto end; goto end;
} }