mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-13 00:46:55 +07:00
[media] media: davinci: vpif_capture: use vb2_ioctl_* helpers
Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
This commit is contained in:
Lad, Prabhakar
Mauro Carvalho Chehab
parent
7ff51197cc
commit
d9a3b13c3a
@ -208,6 +208,12 @@ static int vpif_start_streaming(struct vb2_queue *vq, unsigned int count)
|
||||
}
|
||||
}
|
||||
|
||||
ret = v4l2_subdev_call(ch->sd, video, s_stream, 1);
|
||||
if (ret && ret != -ENOIOCTLCMD && ret != -ENODEV) {
|
||||
vpif_dbg(1, debug, "stream on failed in subdev\n");
|
||||
goto err;
|
||||
}
|
||||
|
||||
/* Call vpif_set_params function to set the parameters and addresses */
|
||||
ret = vpif_set_video_params(vpif, ch->channel_id);
|
||||
|
||||
@ -275,6 +281,7 @@ static void vpif_stop_streaming(struct vb2_queue *vq)
|
||||
struct channel_obj *ch = vb2_get_drv_priv(vq);
|
||||
struct common_obj *common;
|
||||
unsigned long flags;
|
||||
int ret;
|
||||
|
||||
common = &ch->common[VPIF_VIDEO_INDEX];
|
||||
|
||||
@ -290,6 +297,10 @@ static void vpif_stop_streaming(struct vb2_queue *vq)
|
||||
}
|
||||
common->started = 0;
|
||||
|
||||
ret = v4l2_subdev_call(ch->sd, video, s_stream, 0);
|
||||
if (ret && ret != -ENOIOCTLCMD && ret != -ENODEV)
|
||||
vpif_dbg(1, debug, "stream off failed in subdev\n");
|
||||
|
||||
/* release all active buffers */
|
||||
spin_lock_irqsave(&common->irqlock, flags);
|
||||
if (common->cur_frm == common->next_frm) {
|
||||
@ -750,218 +761,6 @@ static void vpif_config_addr(struct channel_obj *ch, int muxmode)
|
||||
common->set_addr = ch0_set_videobuf_addr;
|
||||
}
|
||||
|
||||
/**
|
||||
* vpif_reqbufs() - request buffer handler
|
||||
* @file: file ptr
|
||||
* @priv: file handle
|
||||
* @reqbuf: request buffer structure ptr
|
||||
*/
|
||||
static int vpif_reqbufs(struct file *file, void *priv,
|
||||
struct v4l2_requestbuffers *reqbuf)
|
||||
{
|
||||
struct video_device *vdev = video_devdata(file);
|
||||
struct channel_obj *ch = video_get_drvdata(vdev);
|
||||
struct common_obj *common;
|
||||
u8 index = 0;
|
||||
|
||||
vpif_dbg(2, debug, "vpif_reqbufs\n");
|
||||
|
||||
if (V4L2_BUF_TYPE_VIDEO_CAPTURE != reqbuf->type || !vpif_dev)
|
||||
return -EINVAL;
|
||||
|
||||
index = VPIF_VIDEO_INDEX;
|
||||
|
||||
common = &ch->common[index];
|
||||
|
||||
if (0 != common->io_usrs)
|
||||
return -EBUSY;
|
||||
|
||||
/* Increment io usrs member of channel object to 1 */
|
||||
common->io_usrs = 1;
|
||||
/* Store type of memory requested in channel object */
|
||||
common->memory = reqbuf->memory;
|
||||
|
||||
/* Allocate buffers */
|
||||
return vb2_reqbufs(&common->buffer_queue, reqbuf);
|
||||
}
|
||||
|
||||
/**
|
||||
* vpif_querybuf() - query buffer handler
|
||||
* @file: file ptr
|
||||
* @priv: file handle
|
||||
* @buf: v4l2 buffer structure ptr
|
||||
*/
|
||||
static int vpif_querybuf(struct file *file, void *priv,
|
||||
struct v4l2_buffer *buf)
|
||||
{
|
||||
struct video_device *vdev = video_devdata(file);
|
||||
struct channel_obj *ch = video_get_drvdata(vdev);
|
||||
struct common_obj *common = &ch->common[VPIF_VIDEO_INDEX];
|
||||
|
||||
vpif_dbg(2, debug, "vpif_querybuf\n");
|
||||
|
||||
if (common->fmt.type != buf->type)
|
||||
return -EINVAL;
|
||||
|
||||
if (common->memory != V4L2_MEMORY_MMAP) {
|
||||
vpif_dbg(1, debug, "Invalid memory\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
return vb2_querybuf(&common->buffer_queue, buf);
|
||||
}
|
||||
|
||||
/**
|
||||
* vpif_qbuf() - query buffer handler
|
||||
* @file: file ptr
|
||||
* @priv: file handle
|
||||
* @buf: v4l2 buffer structure ptr
|
||||
*/
|
||||
static int vpif_qbuf(struct file *file, void *priv, struct v4l2_buffer *buf)
|
||||
{
|
||||
|
||||
struct video_device *vdev = video_devdata(file);
|
||||
struct channel_obj *ch = video_get_drvdata(vdev);
|
||||
struct common_obj *common = &ch->common[VPIF_VIDEO_INDEX];
|
||||
struct v4l2_buffer tbuf = *buf;
|
||||
|
||||
vpif_dbg(2, debug, "vpif_qbuf\n");
|
||||
|
||||
if (common->fmt.type != tbuf.type) {
|
||||
vpif_err("invalid buffer type\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
return vb2_qbuf(&common->buffer_queue, buf);
|
||||
}
|
||||
|
||||
/**
|
||||
* vpif_dqbuf() - query buffer handler
|
||||
* @file: file ptr
|
||||
* @priv: file handle
|
||||
* @buf: v4l2 buffer structure ptr
|
||||
*/
|
||||
static int vpif_dqbuf(struct file *file, void *priv, struct v4l2_buffer *buf)
|
||||
{
|
||||
struct video_device *vdev = video_devdata(file);
|
||||
struct channel_obj *ch = video_get_drvdata(vdev);
|
||||
struct common_obj *common = &ch->common[VPIF_VIDEO_INDEX];
|
||||
|
||||
vpif_dbg(2, debug, "vpif_dqbuf\n");
|
||||
|
||||
return vb2_dqbuf(&common->buffer_queue, buf,
|
||||
(file->f_flags & O_NONBLOCK));
|
||||
}
|
||||
|
||||
/**
|
||||
* vpif_streamon() - streamon handler
|
||||
* @file: file ptr
|
||||
* @priv: file handle
|
||||
* @buftype: v4l2 buffer type
|
||||
*/
|
||||
static int vpif_streamon(struct file *file, void *priv,
|
||||
enum v4l2_buf_type buftype)
|
||||
{
|
||||
struct video_device *vdev = video_devdata(file);
|
||||
struct channel_obj *ch = video_get_drvdata(vdev);
|
||||
struct common_obj *common = &ch->common[VPIF_VIDEO_INDEX];
|
||||
struct channel_obj *oth_ch = vpif_obj.dev[!ch->channel_id];
|
||||
struct vpif_params *vpif;
|
||||
int ret = 0;
|
||||
|
||||
vpif_dbg(2, debug, "vpif_streamon\n");
|
||||
|
||||
vpif = &ch->vpifparams;
|
||||
|
||||
if (buftype != V4L2_BUF_TYPE_VIDEO_CAPTURE) {
|
||||
vpif_dbg(1, debug, "buffer type not supported\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
/* If Streaming is already started, return error */
|
||||
if (common->started) {
|
||||
vpif_dbg(1, debug, "channel->started\n");
|
||||
return -EBUSY;
|
||||
}
|
||||
|
||||
if ((ch->channel_id == VPIF_CHANNEL0_VIDEO &&
|
||||
oth_ch->common[VPIF_VIDEO_INDEX].started &&
|
||||
vpif->std_info.ycmux_mode == 0) ||
|
||||
((ch->channel_id == VPIF_CHANNEL1_VIDEO) &&
|
||||
(2 == oth_ch->common[VPIF_VIDEO_INDEX].started))) {
|
||||
vpif_dbg(1, debug, "other channel is being used\n");
|
||||
return -EBUSY;
|
||||
}
|
||||
|
||||
ret = vpif_check_format(ch, &common->fmt.fmt.pix, 0);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
/* Enable streamon on the sub device */
|
||||
ret = v4l2_subdev_call(ch->sd, video, s_stream, 1);
|
||||
|
||||
if (ret && ret != -ENOIOCTLCMD && ret != -ENODEV) {
|
||||
vpif_dbg(1, debug, "stream on failed in subdev\n");
|
||||
return ret;
|
||||
}
|
||||
|
||||
/* Call vb2_streamon to start streaming in videobuf2 */
|
||||
ret = vb2_streamon(&common->buffer_queue, buftype);
|
||||
if (ret) {
|
||||
vpif_dbg(1, debug, "vb2_streamon\n");
|
||||
return ret;
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
/**
|
||||
* vpif_streamoff() - streamoff handler
|
||||
* @file: file ptr
|
||||
* @priv: file handle
|
||||
* @buftype: v4l2 buffer type
|
||||
*/
|
||||
static int vpif_streamoff(struct file *file, void *priv,
|
||||
enum v4l2_buf_type buftype)
|
||||
{
|
||||
|
||||
struct video_device *vdev = video_devdata(file);
|
||||
struct channel_obj *ch = video_get_drvdata(vdev);
|
||||
struct common_obj *common = &ch->common[VPIF_VIDEO_INDEX];
|
||||
int ret;
|
||||
|
||||
vpif_dbg(2, debug, "vpif_streamoff\n");
|
||||
|
||||
if (buftype != V4L2_BUF_TYPE_VIDEO_CAPTURE) {
|
||||
vpif_dbg(1, debug, "buffer type not supported\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
/* If streaming is not started, return error */
|
||||
if (!common->started) {
|
||||
vpif_dbg(1, debug, "channel->started\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
/* disable channel */
|
||||
if (VPIF_CHANNEL0_VIDEO == ch->channel_id) {
|
||||
enable_channel0(0);
|
||||
channel0_intr_enable(0);
|
||||
} else {
|
||||
enable_channel1(0);
|
||||
channel1_intr_enable(0);
|
||||
}
|
||||
|
||||
common->started = 0;
|
||||
|
||||
ret = v4l2_subdev_call(ch->sd, video, s_stream, 0);
|
||||
|
||||
if (ret && ret != -ENOIOCTLCMD && ret != -ENODEV)
|
||||
vpif_dbg(1, debug, "stream off failed in subdev\n");
|
||||
|
||||
return vb2_streamoff(&common->buffer_queue, buftype);
|
||||
}
|
||||
|
||||
/**
|
||||
* vpif_input_to_subdev() - Maps input to sub device
|
||||
* @vpif_cfg - global config ptr
|
||||
@ -1531,15 +1330,20 @@ static const struct v4l2_ioctl_ops vpif_ioctl_ops = {
|
||||
.vidioc_enum_input = vpif_enum_input,
|
||||
.vidioc_s_input = vpif_s_input,
|
||||
.vidioc_g_input = vpif_g_input,
|
||||
.vidioc_reqbufs = vpif_reqbufs,
|
||||
.vidioc_querybuf = vpif_querybuf,
|
||||
|
||||
.vidioc_reqbufs = vb2_ioctl_reqbufs,
|
||||
.vidioc_create_bufs = vb2_ioctl_create_bufs,
|
||||
.vidioc_querybuf = vb2_ioctl_querybuf,
|
||||
.vidioc_qbuf = vb2_ioctl_qbuf,
|
||||
.vidioc_dqbuf = vb2_ioctl_dqbuf,
|
||||
.vidioc_expbuf = vb2_ioctl_expbuf,
|
||||
.vidioc_streamon = vb2_ioctl_streamon,
|
||||
.vidioc_streamoff = vb2_ioctl_streamoff,
|
||||
|
||||
.vidioc_querystd = vpif_querystd,
|
||||
.vidioc_s_std = vpif_s_std,
|
||||
.vidioc_g_std = vpif_g_std,
|
||||
.vidioc_qbuf = vpif_qbuf,
|
||||
.vidioc_dqbuf = vpif_dqbuf,
|
||||
.vidioc_streamon = vpif_streamon,
|
||||
.vidioc_streamoff = vpif_streamoff,
|
||||
|
||||
.vidioc_cropcap = vpif_cropcap,
|
||||
.vidioc_enum_dv_timings = vpif_enum_dv_timings,
|
||||
.vidioc_query_dv_timings = vpif_query_dv_timings,
|
||||
|
||||
Loading…
Reference in New Issue
Block a user