Commit b1df3129 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

media: xilinx: set device_caps in struct video_device 



Instead of filling in the struct v4l2_capability device_caps
field, fill in the struct video_device device_caps field.

That way the V4L2 core knows what the capabilities of the
video device are.

Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 0fe3331e

drivers/media/platform/xilinx/xilinx-dma.c

+7 −9
Original line number Diff line number Diff line
@@ -491,15 +491,8 @@ 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->device_caps = V4L2_CAP_STREAMING;



	if (dma->queue.type == V4L2_BUF_TYPE_VIDEO_CAPTURE)

		cap->device_caps |= V4L2_CAP_VIDEO_CAPTURE;

	else

		cap->device_caps |= V4L2_CAP_VIDEO_OUTPUT;



	cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS

			  | dma->xdev->v4l2_caps;

	cap->capabilities = dma->xdev->v4l2_caps | V4L2_CAP_STREAMING |

			    V4L2_CAP_DEVICE_CAPS;



	strscpy(cap->driver, "xilinx-vipp", sizeof(cap->driver));

	strscpy(cap->card, dma->video.name, sizeof(cap->card));
@@ -698,6 +691,11 @@ int xvip_dma_init(struct xvip_composite_device *xdev, struct xvip_dma *dma, 
	dma->video.release = video_device_release_empty;

	dma->video.ioctl_ops = &xvip_dma_ioctl_ops;

	dma->video.lock = &dma->lock;

	dma->video.device_caps = V4L2_CAP_STREAMING;

	if (type == V4L2_BUF_TYPE_VIDEO_CAPTURE)

		dma->video.device_caps |= V4L2_CAP_VIDEO_CAPTURE;

	else

		dma->video.device_caps |= V4L2_CAP_VIDEO_OUTPUT;



	video_set_drvdata(&dma->video, dma);