Message ID | 20190221103212.28764-2-laurent.pinchart+renesas@ideasonboard.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | R-Car DU display writeback support | expand |
Hi Laurent, On 21/02/2019 10:31, Laurent Pinchart wrote: > From: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com> > > This reverts commit 3299ba5c0b21 ("[media] v4l: vsp1: Supply frames to > the DU continuously") > > 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> Don't forget to add your SoB or such here :) -- Regards Kieran > --- > 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 7ceaf3222145..328d686189be 100644 > --- a/drivers/media/platform/vsp1/vsp1_video.c > +++ b/drivers/media/platform/vsp1/vsp1_video.c > @@ -307,11 +307,6 @@ static int vsp1_video_pipeline_setup_partitions(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 * > @@ -333,12 +328,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 7ceaf3222145..328d686189be 100644 --- a/drivers/media/platform/vsp1/vsp1_video.c +++ b/drivers/media/platform/vsp1/vsp1_video.c @@ -307,11 +307,6 @@ static int vsp1_video_pipeline_setup_partitions(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 * @@ -333,12 +328,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))