lkml.org 
[lkml]   [2018]   [Jul]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 126/157] media: vsp1: Release buffers for each video node
    Date
    4.14-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>

    commit 83967993f2320575c0ab27a80bf1d7535909c2f4 upstream.

    Commit 372b2b0399fc ("media: v4l: vsp1: Release buffers in
    start_streaming error path") introduced a helper to clean up buffers on
    error paths, but inadvertently changed the code such that only the
    output WPF buffers were cleaned, rather than the video node being
    operated on.

    Since then vsp1_video_cleanup_pipeline() has grown to perform both video
    node cleanup, as well as pipeline cleanup. Split the implementation into
    two distinct functions that perform the required work, so that each
    video node can release its buffers correctly on streamoff. The pipe
    cleanup that was performed in the vsp1_video_stop_streaming() (releasing
    the pipe->dl) is moved to the function for clarity.

    Fixes: 372b2b0399fc ("media: v4l: vsp1: Release buffers in start_streaming error path")

    Cc: stable@vger.kernel.org # v4.14+
    Signed-off-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
    Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/media/platform/vsp1/vsp1_video.c | 21 +++++++++++++--------
    1 file changed, 13 insertions(+), 8 deletions(-)

    --- a/drivers/media/platform/vsp1/vsp1_video.c
    +++ b/drivers/media/platform/vsp1/vsp1_video.c
    @@ -849,9 +849,8 @@ static int vsp1_video_setup_pipeline(str
    return 0;
    }

    -static void vsp1_video_cleanup_pipeline(struct vsp1_pipeline *pipe)
    +static void vsp1_video_release_buffers(struct vsp1_video *video)
    {
    - struct vsp1_video *video = pipe->output->video;
    struct vsp1_vb2_buffer *buffer;
    unsigned long flags;

    @@ -861,12 +860,18 @@ static void vsp1_video_cleanup_pipeline(
    vb2_buffer_done(&buffer->buf.vb2_buf, VB2_BUF_STATE_ERROR);
    INIT_LIST_HEAD(&video->irqqueue);
    spin_unlock_irqrestore(&video->irqlock, flags);
    +}
    +
    +static void vsp1_video_cleanup_pipeline(struct vsp1_pipeline *pipe)
    +{
    + lockdep_assert_held(&pipe->lock);

    /* Release our partition table allocation */
    - mutex_lock(&pipe->lock);
    kfree(pipe->part_table);
    pipe->part_table = NULL;
    - mutex_unlock(&pipe->lock);
    +
    + vsp1_dl_list_put(pipe->dl);
    + pipe->dl = NULL;
    }

    static int vsp1_video_start_streaming(struct vb2_queue *vq, unsigned int count)
    @@ -881,8 +886,9 @@ static int vsp1_video_start_streaming(st
    if (pipe->stream_count == pipe->num_inputs) {
    ret = vsp1_video_setup_pipeline(pipe);
    if (ret < 0) {
    - mutex_unlock(&pipe->lock);
    + vsp1_video_release_buffers(video);
    vsp1_video_cleanup_pipeline(pipe);
    + mutex_unlock(&pipe->lock);
    return ret;
    }

    @@ -932,13 +938,12 @@ static void vsp1_video_stop_streaming(st
    if (ret == -ETIMEDOUT)
    dev_err(video->vsp1->dev, "pipeline stop timeout\n");

    - vsp1_dl_list_put(pipe->dl);
    - pipe->dl = NULL;
    + vsp1_video_cleanup_pipeline(pipe);
    }
    mutex_unlock(&pipe->lock);

    media_pipeline_stop(&video->video.entity);
    - vsp1_video_cleanup_pipeline(pipe);
    + vsp1_video_release_buffers(video);
    vsp1_video_pipeline_put(pipe);
    }


    \
     
     \ /
      Last update: 2018-07-01 19:43    [W:4.154 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site