v4l: vsp1: Postpone frame end handling in event of display list race

If we try to commit the display list while an update is pending, we have
missed our opportunity. The display list manager will hold the commit
until the next interrupt.

In this event, we skip the pipeline completion callback handler so that
the pipeline will not mistakenly report frame completion to the user.

Signed-off-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

diff --git a/drivers/media/platform/vsp1/vsp1_dl.c b/drivers/media/platform/vsp1/vsp1_dl.c
index 7d8f37772b562b24337c63f4cc08982ee025fb53..85fe2b4ae310121b1fa2d54f8eadc193efe2ad13 100644 (file)
--- a/drivers/media/platform/vsp1/vsp1_dl.c
+++ b/drivers/media/platform/vsp1/vsp1_dl.c
@@ -561,9 +561,19 @@ void vsp1_dlm_irq_display_start(struct vsp1_dl_manager *dlm)
        spin_unlock(&dlm->lock);
 }
 
-void vsp1_dlm_irq_frame_end(struct vsp1_dl_manager *dlm)
+/**
+ * vsp1_dlm_irq_frame_end - Display list handler for the frame end interrupt
+ * @dlm: the display list manager
+ *
+ * Return true if the previous display list has completed at frame end, or false
+ * if it has been delayed by one frame because the display list commit raced
+ * with the frame end interrupt. The function always returns true in header mode
+ * as display list processing is then not continuous and races never occur.
+ */
+bool vsp1_dlm_irq_frame_end(struct vsp1_dl_manager *dlm)
 {
        struct vsp1_device *vsp1 = dlm->vsp1;
+       bool completed = false;
 
        spin_lock(&dlm->lock);
 
@@ -575,8 +585,10 @@ void vsp1_dlm_irq_frame_end(struct vsp1_dl_manager *dlm)
         * perform any operation as there can't be any new display list queued
         * in that case.
         */
-       if (dlm->mode == VSP1_DL_MODE_HEADER)
+       if (dlm->mode == VSP1_DL_MODE_HEADER) {
+               completed = true;
                goto done;
+       }
 
        /*
         * The UPD bit set indicates that the commit operation raced with the
@@ -594,6 +606,7 @@ void vsp1_dlm_irq_frame_end(struct vsp1_dl_manager *dlm)
        if (dlm->queued) {
                dlm->active = dlm->queued;
                dlm->queued = NULL;
+               completed = true;
        }
 
        /*
@@ -614,6 +627,8 @@ void vsp1_dlm_irq_frame_end(struct vsp1_dl_manager *dlm)
 
 done:
        spin_unlock(&dlm->lock);
+
+       return completed;
 }
 
 /* Hardware Setup */

diff --git a/drivers/media/platform/vsp1/vsp1_dl.h b/drivers/media/platform/vsp1/vsp1_dl.h
index 7131aa3c597873f2e38c8b0d4b72faf10567e46b..6ec1380a10afbf6e2cdbd037a589d284a036fbd4 100644 (file)
--- a/drivers/media/platform/vsp1/vsp1_dl.h
+++ b/drivers/media/platform/vsp1/vsp1_dl.h
@@ -28,7 +28,7 @@ struct vsp1_dl_manager *vsp1_dlm_create(struct vsp1_device *vsp1,
 void vsp1_dlm_destroy(struct vsp1_dl_manager *dlm);
 void vsp1_dlm_reset(struct vsp1_dl_manager *dlm);
 void vsp1_dlm_irq_display_start(struct vsp1_dl_manager *dlm);
-void vsp1_dlm_irq_frame_end(struct vsp1_dl_manager *dlm);
+bool vsp1_dlm_irq_frame_end(struct vsp1_dl_manager *dlm);
 
 struct vsp1_dl_list *vsp1_dl_list_get(struct vsp1_dl_manager *dlm);
 void vsp1_dl_list_put(struct vsp1_dl_list *dl);

diff --git a/drivers/media/platform/vsp1/vsp1_pipe.c b/drivers/media/platform/vsp1/vsp1_pipe.c
index edebf3fa926f6a341d3aba4a899f312597342988..e817623b84e04632440d5d5155b56f96c7345c5e 100644 (file)
--- a/drivers/media/platform/vsp1/vsp1_pipe.c
+++ b/drivers/media/platform/vsp1/vsp1_pipe.c
@@ -330,10 +330,21 @@ bool vsp1_pipeline_ready(struct vsp1_pipeline *pipe)
 
 void vsp1_pipeline_frame_end(struct vsp1_pipeline *pipe)
 {
+       bool completed;
+
        if (pipe == NULL)
                return;
 
-       vsp1_dlm_irq_frame_end(pipe->output->dlm);
+       completed = vsp1_dlm_irq_frame_end(pipe->output->dlm);
+       if (!completed) {
+               /*
+                * If the DL commit raced with the frame end interrupt, the
+                * commit ends up being postponed by one frame. Return
+                * immediately without calling the pipeline's frame end handler
+                * or incrementing the sequence number.
+                */
+               return;
+       }
 
        if (pipe->hgo)
                vsp1_hgo_frame_end(pipe->hgo);