lkml.org 
[lkml]   [2018]   [May]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v9 01/15] xilinx: regroup caps on querycap
    Date
    From: Gustavo Padovan <gustavo.padovan@collabora.com>

    To better organize the code we concentrate the setting of
    V4L2_CAP_STREAMING in one place.

    v2: move cap->capabilities assignment down (Hans Verkuil)

    Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.com>
    ---
    drivers/media/platform/xilinx/xilinx-dma.c | 10 ++++++----
    1 file changed, 6 insertions(+), 4 deletions(-)

    diff --git a/drivers/media/platform/xilinx/xilinx-dma.c b/drivers/media/platform/xilinx/xilinx-dma.c
    index 522cdfdd3345..d041f94be832 100644
    --- a/drivers/media/platform/xilinx/xilinx-dma.c
    +++ b/drivers/media/platform/xilinx/xilinx-dma.c
    @@ -494,13 +494,15 @@ xvip_dma_querycap(struct file *file, void *fh, struct v4l2_capability *cap)
    struct v4l2_fh *vfh = file->private_data;
    struct xvip_dma *dma = to_xvip_dma(vfh->vdev);

    - cap->capabilities = V4L2_CAP_DEVICE_CAPS | V4L2_CAP_STREAMING
    - | dma->xdev->v4l2_caps;
    + cap->device_caps = V4L2_CAP_STREAMING;

    if (dma->queue.type == V4L2_BUF_TYPE_VIDEO_CAPTURE)
    - cap->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING;
    + cap->device_caps |= V4L2_CAP_VIDEO_CAPTURE;
    else
    - cap->device_caps = V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_STREAMING;
    + cap->device_caps |= V4L2_CAP_VIDEO_OUTPUT;
    +
    + cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS
    + | dma->xdev->v4l2_caps;

    strlcpy(cap->driver, "xilinx-vipp", sizeof(cap->driver));
    strlcpy(cap->card, dma->video.name, sizeof(cap->card));
    --
    2.16.3
    \
     
     \ /
      Last update: 2018-05-04 22:08    [W:2.411 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site