On 4/25/19 10:22 PM, André Almeida wrote:
> Create multiplanar kernel module parameter to define if the driver is
> running in single planar or in multiplanar mode. Define the device
> capabilities according to the multiplanar kernel parameter. A device can't
> support both CAP_VIDEO_CAPTURE and CAP_VIDEO_CAPTURE_MPLANAR at the
> same time.
>
> Signed-off-by: André Almeida <andrealm...@collabora.com>
Acked-by: Helen Koike <helen.ko...@collabora.com>
> ---
> Change in v4:
> - Split commit with "Add handler for multiplanar fmt ioctls"
>
> Change in v3:
> - Squash commit with "Add handler for multiplanar fmt ioctls"
> - Remove functions that only did the `IS_MULTIPLANAR(vcap)` check
> - Assign ioctls according to device capabilities
>
> Changes in v2:
> - Squash commits to create multiplanar module parameter and to define
> the device capabilities
> - Move the creation of the multiplanar parameter to the end of
> history, so it's only added when all required changes are applied
>
> drivers/media/platform/vimc/vimc-capture.c | 12 ++++++++++--
> 1 file changed, 10 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/media/platform/vimc/vimc-capture.c
> b/drivers/media/platform/vimc/vimc-capture.c
> index 932d622d56ca..c5959b8e21f7 100644
> --- a/drivers/media/platform/vimc/vimc-capture.c
> +++ b/drivers/media/platform/vimc/vimc-capture.c
> @@ -28,6 +28,10 @@
>
> #define VIMC_CAP_DRV_NAME "vimc-capture"
>
> +static unsigned int multiplanar;
> +module_param(multiplanar, uint, 0000);
> +MODULE_PARM_DESC(multiplanar, "0 (default) creates a single planar device, 1
> creates a multiplanar device.");
> +
> /* Checks if the device supports multiplanar capture */
> #define IS_MULTIPLANAR(vcap) \
> (vcap->vdev.device_caps & V4L2_CAP_VIDEO_CAPTURE_MPLANE)
> @@ -597,7 +601,9 @@ static int vimc_cap_comp_bind(struct device *comp, struct
> device *master,
>
> /* Initialize the vb2 queue */
> q = &vcap->queue;
> - q->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
> + q->type = multiplanar ?
> + V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE :
> + V4L2_BUF_TYPE_VIDEO_CAPTURE;
> q->io_modes = VB2_MMAP | VB2_DMABUF | VB2_USERPTR;
> q->drv_priv = vcap;
> q->buf_struct_size = sizeof(struct vimc_cap_buffer);
> @@ -627,7 +633,9 @@ static int vimc_cap_comp_bind(struct device *comp, struct
> device *master,
>
> /* Initialize the video_device struct */
> vdev = &vcap->vdev;
> - vdev->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING;
> + vdev->device_caps = (multiplanar ?
> + V4L2_CAP_VIDEO_CAPTURE_MPLANE :
> + V4L2_CAP_VIDEO_CAPTURE) | V4L2_CAP_STREAMING;
> vdev->entity.ops = &vimc_cap_mops;
> vdev->release = vimc_cap_release;
> vdev->fops = &vimc_cap_fops;
>
