drm/msm: dpu: Don't set frame_busy_mask for async updates

[ Upstream commit f98baa3109cea46083d2361ab14a0207d1b1bd16 ]

The frame_busy mask is used in frame_done event handling, which is not
invoked for async commits. So an async commit will leave the
frame_busy mask populated after it completes and future commits will start
with the busy mask incorrect.

This showed up on disable after cursor move. I was hitting the "this should
not happen" comment in the frame event worker since frame_busy was set,
we queued the event, but there were no frames pending (since async
also doesn't set that).

Reviewed-by: Fritz Koenig <frkoenig@google.com>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20190130163220.138637-1-sean@poorly.run
Signed-off-by: Rob Clark <robdclark@chromium.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
index f59c00191a2a2002e10d13198112ce30b3b2125b..dd2c4d11d0e1d33c27df8350f91899c334579652 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
@@ -1550,8 +1550,14 @@ static void _dpu_encoder_kickoff_phys(struct dpu_encoder_virt *dpu_enc,
                if (!ctl)
                        continue;
 
-               if (phys->split_role != ENC_ROLE_SLAVE)
+               /*
+                * This is cleared in frame_done worker, which isn't invoked
+                * for async commits. So don't set this for async, since it'll
+                * roll over to the next commit.
+                */
+               if (!async && phys->split_role != ENC_ROLE_SLAVE)
                        set_bit(i, dpu_enc->frame_busy_mask);
+
                if (!phys->ops.needs_single_flush ||
                                !phys->ops.needs_single_flush(phys))
                        _dpu_encoder_trigger_flush(&dpu_enc->base, phys, 0x0,