diff options
| author | Hans Verkuil | 2018-05-30 08:46:22 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2018-08-31 17:19:30 +0200 |
| commit | 394dc588809158826e2877adb670391829f91c63 (patch) | |
| tree | 0d8efd884d299507f54d857640cb5ebfa8c72d23 /drivers/staging | |
| parent | media: videobuf2-core: integrate with media requests (diff) | |
| download | kernel-qcow2-linux-394dc588809158826e2877adb670391829f91c63.tar.gz kernel-qcow2-linux-394dc588809158826e2877adb670391829f91c63.tar.xz kernel-qcow2-linux-394dc588809158826e2877adb670391829f91c63.zip | |
media: videobuf2-v4l2: integrate with media requests
This implements the V4L2 part of the request support. The main
change is that vb2_qbuf and vb2_prepare_buf now have a new
media_device pointer. This required changes to several drivers
that did not use the vb2_ioctl_qbuf/prepare_buf helper functions.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Reviewed-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/media/davinci_vpfe/vpfe_video.c | 3 | ||||
| -rw-r--r-- | drivers/staging/media/omap4iss/iss_video.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/drivers/staging/media/davinci_vpfe/vpfe_video.c b/drivers/staging/media/davinci_vpfe/vpfe_video.c index 4e3ec7fdc90d..6d693067a251 100644 --- a/drivers/staging/media/davinci_vpfe/vpfe_video.c +++ b/drivers/staging/media/davinci_vpfe/vpfe_video.c @@ -1425,7 +1425,8 @@ static int vpfe_qbuf(struct file *file, void *priv, return -EACCES; } - return vb2_qbuf(&video->buffer_queue, p); + return vb2_qbuf(&video->buffer_queue, + video->video_dev.v4l2_dev->mdev, p); } /* diff --git a/drivers/staging/media/omap4iss/iss_video.c b/drivers/staging/media/omap4iss/iss_video.c index 16478fe9e3f8..ccb50fea3314 100644 --- a/drivers/staging/media/omap4iss/iss_video.c +++ b/drivers/staging/media/omap4iss/iss_video.c @@ -806,9 +806,10 @@ iss_video_querybuf(struct file *file, void *fh, struct v4l2_buffer *b) static int iss_video_qbuf(struct file *file, void *fh, struct v4l2_buffer *b) { + struct iss_video *video = video_drvdata(file); struct iss_video_fh *vfh = to_iss_video_fh(fh); - return vb2_qbuf(&vfh->queue, b); + return vb2_qbuf(&vfh->queue, video->video.v4l2_dev->mdev, b); } static int |