| Message ID | 1477576885-21978-2-git-send-email-kieran.bingham+renesas@ideasonboard.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Geert Uytterhoeven |
| Headers | show |
Hi Kieran, Thank you for the patch. On Thursday 27 Oct 2016 15:01:23 Kieran Bingham wrote: > This reverts commit 3299ba5c0b213be5d911752d40251c1abc1004f7. > > The DU output mode does not rely on frames being supplied on the WPF as > its pipeline is supplied from DRM. For the upcoming WPF writeback > functionality, we will choose to enable writeback mode if there is an > output buffer, or disable it (leaving the existing display pipeline > unharmed) otherwise. > > Signed-off-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> and applied to my tree. > --- > drivers/media/platform/vsp1/vsp1_video.c | 11 ----------- > 1 file changed, 11 deletions(-) > > diff --git a/drivers/media/platform/vsp1/vsp1_video.c > b/drivers/media/platform/vsp1/vsp1_video.c index 94b428596c4f..f10401065cd3 > 100644 > --- a/drivers/media/platform/vsp1/vsp1_video.c > +++ b/drivers/media/platform/vsp1/vsp1_video.c > @@ -296,11 +296,6 @@ static struct v4l2_rect vsp1_video_partition(struct > vsp1_pipeline *pipe, * This function completes the current buffer by > filling its sequence number, * time stamp and payload size, and hands it > back to the videobuf core. * > - * When operating in DU output mode (deep pipeline to the DU through the > LIF), - * the VSP1 needs to constantly supply frames to the display. In > that case, if - * no other buffer is queued, reuse the one that has just > been processed instead - * of handing it back to the videobuf core. > - * > * Return the next queued buffer or NULL if the queue is empty. > */ > static struct vsp1_vb2_buffer * > @@ -322,12 +317,6 @@ vsp1_video_complete_buffer(struct vsp1_video *video) > done = list_first_entry(&video->irqqueue, > struct vsp1_vb2_buffer, queue); > > - /* In DU output mode reuse the buffer if the list is singular. */ > - if (pipe->lif && list_is_singular(&video->irqqueue)) { > - spin_unlock_irqrestore(&video->irqlock, flags); > - return done; > - } > - > list_del(&done->queue); > > if (!list_empty(&video->irqqueue))
diff --git a/drivers/media/platform/vsp1/vsp1_video.c b/drivers/media/platform/vsp1/vsp1_video.c index 94b428596c4f..f10401065cd3 100644 --- a/drivers/media/platform/vsp1/vsp1_video.c +++ b/drivers/media/platform/vsp1/vsp1_video.c @@ -296,11 +296,6 @@ static struct v4l2_rect vsp1_video_partition(struct vsp1_pipeline *pipe, * This function completes the current buffer by filling its sequence number, * time stamp and payload size, and hands it back to the videobuf core. * - * When operating in DU output mode (deep pipeline to the DU through the LIF), - * the VSP1 needs to constantly supply frames to the display. In that case, if - * no other buffer is queued, reuse the one that has just been processed instead - * of handing it back to the videobuf core. - * * Return the next queued buffer or NULL if the queue is empty. */ static struct vsp1_vb2_buffer * @@ -322,12 +317,6 @@ vsp1_video_complete_buffer(struct vsp1_video *video) done = list_first_entry(&video->irqqueue, struct vsp1_vb2_buffer, queue); - /* In DU output mode reuse the buffer if the list is singular. */ - if (pipe->lif && list_is_singular(&video->irqqueue)) { - spin_unlock_irqrestore(&video->irqlock, flags); - return done; - } - list_del(&done->queue); if (!list_empty(&video->irqqueue))
This reverts commit 3299ba5c0b213be5d911752d40251c1abc1004f7. The DU output mode does not rely on frames being supplied on the WPF as its pipeline is supplied from DRM. For the upcoming WPF writeback functionality, we will choose to enable writeback mode if there is an output buffer, or disable it (leaving the existing display pipeline unharmed) otherwise. Signed-off-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com> --- drivers/media/platform/vsp1/vsp1_video.c | 11 ----------- 1 file changed, 11 deletions(-)