drm/msm/dpu: Fix timeout issues on command mode panels

In function dpu_encoder_phys_cmd_wait_for_commit_done we are always
checking if the relative CTL is started by waiting for an interrupt
to fire: it is fine to do that, but then sometimes we call this
function while the CTL is up and has never been put down, but that
interrupt gets raised only when the CTL gets a state change from
0 to 1 (disabled to enabled), so we're going to wait for something
that will never happen on its own.

Solving this while avoiding to restart the CTL is actually possible
and can be done by just checking if it is already up and running
when the wait_for_commit_done function is called: in this case, so,
if the CTL was already running, we can say that the commit is done
if the command transmission is complete (in other terms, if the
interface has been flushed).

Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@somainline.org>
Reviewed-by: Marijn Suijten <marijn.suijten@somainline.org>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20210911163919.47173-2-angelogioacchino.delregno@somainline.org
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c
index 56c1bd2201102e7ecee00d5bc4bbf2dff5f787eb..d59802b67d1537e5c61b14c5ac4dc7a811ece7ca 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c
@@ -656,6 +656,9 @@ static int dpu_encoder_phys_cmd_wait_for_commit_done(
        if (!dpu_encoder_phys_cmd_is_master(phys_enc))
                return 0;
 
+       if (phys_enc->hw_ctl->ops.is_started(phys_enc->hw_ctl))
+               return dpu_encoder_phys_cmd_wait_for_tx_complete(phys_enc);
+
        return _dpu_encoder_phys_cmd_wait_for_ctl_start(phys_enc);
 }