lkml.org 
[lkml]   [2023]   [Oct]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v11 30/56] media: ti: Use queue min_buffers_needed field to set the min number of buffers
    Date
    When queue min_buffers_needed field is correctly set vb2 queue_setup()
    does take care of it and we can remove the checks from drivers.

    Signed-off-by: Benjamin Gaignard <benjamin.gaignard@collabora.com>
    CC: "Lad, Prabhakar" <prabhakar.csengg@gmail.com>
    ---
    drivers/media/platform/ti/am437x/am437x-vpfe.c | 7 ++-----
    drivers/media/platform/ti/cal/cal-video.c | 5 +----
    drivers/media/platform/ti/davinci/vpif_capture.c | 5 +----
    drivers/media/platform/ti/davinci/vpif_display.c | 5 +----
    drivers/media/platform/ti/omap/omap_vout.c | 5 +++--
    5 files changed, 8 insertions(+), 19 deletions(-)

    diff --git a/drivers/media/platform/ti/am437x/am437x-vpfe.c b/drivers/media/platform/ti/am437x/am437x-vpfe.c
    index 5fa2ea9025d9..80a74ee59bb9 100644
    --- a/drivers/media/platform/ti/am437x/am437x-vpfe.c
    +++ b/drivers/media/platform/ti/am437x/am437x-vpfe.c
    @@ -1772,9 +1772,6 @@ static int vpfe_queue_setup(struct vb2_queue *vq,
    struct vpfe_device *vpfe = vb2_get_drv_priv(vq);
    unsigned size = vpfe->fmt.fmt.pix.sizeimage;

    - if (vq->num_buffers + *nbuffers < 3)
    - *nbuffers = 3 - vq->num_buffers;
    -
    if (*nplanes) {
    if (sizes[0] < size)
    return -EINVAL;
    @@ -1785,7 +1782,7 @@ static int vpfe_queue_setup(struct vb2_queue *vq,
    sizes[0] = size;

    vpfe_dbg(1, vpfe,
    - "nbuffers=%d, size=%u\n", *nbuffers, sizes[0]);
    + "nbuffers=%u, size=%u\n", vb2_get_num_buffers(vq), sizes[0]);

    /* Calculate field offset */
    vpfe_calculate_offsets(vpfe);
    @@ -2233,7 +2230,7 @@ static int vpfe_probe_complete(struct vpfe_device *vpfe)
    q->buf_struct_size = sizeof(struct vpfe_cap_buffer);
    q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
    q->lock = &vpfe->lock;
    - q->min_buffers_needed = 1;
    + q->min_buffers_needed = 3;
    q->dev = vpfe->pdev;

    err = vb2_queue_init(q);
    diff --git a/drivers/media/platform/ti/cal/cal-video.c b/drivers/media/platform/ti/cal/cal-video.c
    index a8abcd0fee17..924465b37e5f 100644
    --- a/drivers/media/platform/ti/cal/cal-video.c
    +++ b/drivers/media/platform/ti/cal/cal-video.c
    @@ -604,9 +604,6 @@ static int cal_queue_setup(struct vb2_queue *vq,
    struct cal_ctx *ctx = vb2_get_drv_priv(vq);
    unsigned int size = ctx->v_fmt.fmt.pix.sizeimage;

    - if (vq->num_buffers + *nbuffers < 3)
    - *nbuffers = 3 - vq->num_buffers;
    -
    if (*nplanes) {
    if (sizes[0] < size)
    return -EINVAL;
    @@ -616,7 +613,7 @@ static int cal_queue_setup(struct vb2_queue *vq,
    *nplanes = 1;
    sizes[0] = size;

    - ctx_dbg(3, ctx, "nbuffers=%d, size=%d\n", *nbuffers, sizes[0]);
    + ctx_dbg(3, ctx, "nbuffers=%d, size=%d\n", vb2_get_num_buffers(vq), sizes[0]);

    return 0;
    }
    diff --git a/drivers/media/platform/ti/davinci/vpif_capture.c b/drivers/media/platform/ti/davinci/vpif_capture.c
    index 99fae8830c41..8a4cc62cf562 100644
    --- a/drivers/media/platform/ti/davinci/vpif_capture.c
    +++ b/drivers/media/platform/ti/davinci/vpif_capture.c
    @@ -122,9 +122,6 @@ static int vpif_buffer_queue_setup(struct vb2_queue *vq,
    size = sizes[0];
    }

    - if (vq->num_buffers + *nbuffers < 3)
    - *nbuffers = 3 - vq->num_buffers;
    -
    *nplanes = 1;
    sizes[0] = size;

    @@ -1428,7 +1425,7 @@ static int vpif_probe_complete(void)
    q->mem_ops = &vb2_dma_contig_memops;
    q->buf_struct_size = sizeof(struct vpif_cap_buffer);
    q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
    - q->min_buffers_needed = 1;
    + q->min_buffers_needed = 3;
    q->lock = &common->lock;
    q->dev = vpif_dev;

    diff --git a/drivers/media/platform/ti/davinci/vpif_display.c b/drivers/media/platform/ti/davinci/vpif_display.c
    index f8ec2991c667..6fc32314cf9c 100644
    --- a/drivers/media/platform/ti/davinci/vpif_display.c
    +++ b/drivers/media/platform/ti/davinci/vpif_display.c
    @@ -122,9 +122,6 @@ static int vpif_buffer_queue_setup(struct vb2_queue *vq,
    size = sizes[0];
    }

    - if (vq->num_buffers + *nbuffers < 3)
    - *nbuffers = 3 - vq->num_buffers;
    -
    *nplanes = 1;
    sizes[0] = size;

    @@ -1168,7 +1165,7 @@ static int vpif_probe_complete(void)
    q->mem_ops = &vb2_dma_contig_memops;
    q->buf_struct_size = sizeof(struct vpif_disp_buffer);
    q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
    - q->min_buffers_needed = 1;
    + q->min_buffers_needed = 3;
    q->lock = &common->lock;
    q->dev = vpif_dev;
    err = vb2_queue_init(q);
    diff --git a/drivers/media/platform/ti/omap/omap_vout.c b/drivers/media/platform/ti/omap/omap_vout.c
    index 4143274089c3..72ce903717d3 100644
    --- a/drivers/media/platform/ti/omap/omap_vout.c
    +++ b/drivers/media/platform/ti/omap/omap_vout.c
    @@ -944,10 +944,11 @@ static int omap_vout_vb2_queue_setup(struct vb2_queue *vq,
    struct device *alloc_devs[])
    {
    struct omap_vout_device *vout = vb2_get_drv_priv(vq);
    + unsigned int q_num_bufs = vb2_get_num_buffers(vq);
    int size = vout->pix.sizeimage;

    - if (is_rotation_enabled(vout) && vq->num_buffers + *nbufs > VRFB_NUM_BUFS) {
    - *nbufs = VRFB_NUM_BUFS - vq->num_buffers;
    + if (is_rotation_enabled(vout) && q_num_bufs + *nbufs > VRFB_NUM_BUFS) {
    + *nbufs = VRFB_NUM_BUFS - q_num_bufs;
    if (*nbufs == 0)
    return -EINVAL;
    }
    --
    2.39.2
    \
     
     \ /
      Last update: 2023-10-12 13:50    [W:4.700 / U:0.240 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site