lkml.org 
[lkml]   [2014]   [Oct]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 05/15] media: davinci: vpbe: improve vpbe_buffer_prepare() callback
    Date
    this patch improve vpbe_buffer_prepare() callback, as buf_prepare()
    callback is never called with invalid state and check for
    vb2_plane_vaddr(vb, 0) is dropped as payload check should
    be done unconditionally.

    Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
    ---
    drivers/media/platform/davinci/vpbe_display.c | 23 ++++++++---------------
    1 file changed, 8 insertions(+), 15 deletions(-)

    diff --git a/drivers/media/platform/davinci/vpbe_display.c b/drivers/media/platform/davinci/vpbe_display.c
    index 491b832..524e1fd 100644
    --- a/drivers/media/platform/davinci/vpbe_display.c
    +++ b/drivers/media/platform/davinci/vpbe_display.c
    @@ -215,22 +215,15 @@ static int vpbe_buffer_prepare(struct vb2_buffer *vb)
    v4l2_dbg(1, debug, &vpbe_dev->v4l2_dev,
    "vpbe_buffer_prepare\n");

    - if (vb->state != VB2_BUF_STATE_ACTIVE &&
    - vb->state != VB2_BUF_STATE_PREPARED) {
    - vb2_set_plane_payload(vb, 0, layer->pix_fmt.sizeimage);
    - if (vb2_plane_vaddr(vb, 0) &&
    - vb2_get_plane_payload(vb, 0) > vb2_plane_size(vb, 0))
    - return -EINVAL;
    + vb2_set_plane_payload(vb, 0, layer->pix_fmt.sizeimage);
    + if (vb2_get_plane_payload(vb, 0) > vb2_plane_size(vb, 0))
    + return -EINVAL;

    - addr = vb2_dma_contig_plane_dma_addr(vb, 0);
    - if (q->streaming) {
    - if (!IS_ALIGNED(addr, 8)) {
    - v4l2_err(&vpbe_dev->v4l2_dev,
    - "buffer_prepare:offset is \
    - not aligned to 32 bytes\n");
    - return -EINVAL;
    - }
    - }
    + addr = vb2_dma_contig_plane_dma_addr(vb, 0);
    + if (!IS_ALIGNED(addr, 8)) {
    + v4l2_err(&vpbe_dev->v4l2_dev,
    + "buffer_prepare:offset is not aligned to 32 bytes\n");
    + return -EINVAL;
    }
    return 0;
    }
    --
    1.9.1


    \
     
     \ /
      Last update: 2014-10-12 23:21    [W:3.446 / U:0.264 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site