Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 73a01599 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files

[media] v4l: soc-camera: Remove videobuf1 support 



All remaining soc-camera drivers use videobuf2, drop support for
videobuf1.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
[hans.verkuil@cisco.com: also drop 'select VIDEOBUF_GEN' from Kconfig]

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent e8a2a41e

drivers/media/platform/soc_camera/Kconfig

+0 −1
Original line number Diff line number Diff line 
config SOC_CAMERA

	tristate "SoC camera support"

	depends on VIDEO_V4L2 && HAS_DMA && I2C

	select VIDEOBUF_GEN

	select VIDEOBUF2_CORE

	help

	  SoC Camera is a common API to several cameras, not connecting

drivers/media/platform/soc_camera/soc_camera.c

+19 −84
Original line number Diff line number Diff line
@@ -37,18 +37,12 @@ 
#include <media/v4l2-ioctl.h>

#include <media/v4l2-dev.h>

#include <media/v4l2-of.h>

#include <media/videobuf-core.h>

#include <media/videobuf2-v4l2.h>



/* Default to VGA resolution */

#define DEFAULT_WIDTH	640

#define DEFAULT_HEIGHT	480



#define is_streaming(ici, icd)				\

	(((ici)->ops->init_videobuf) ?			\

	 (icd)->vb_vidq.streaming :			\

	 vb2_is_streaming(&(icd)->vb2_vidq))



#define MAP_MAX_NUM 32

static DECLARE_BITMAP(device_map, MAP_MAX_NUM);

static LIST_HEAD(hosts);
@@ -367,23 +361,13 @@ static int soc_camera_reqbufs(struct file *file, void *priv, 
{

	int ret;

	struct soc_camera_device *icd = file->private_data;

	struct soc_camera_host *ici = to_soc_camera_host(icd->parent);



	WARN_ON(priv != file->private_data);



	if (icd->streamer && icd->streamer != file)

		return -EBUSY;



	if (ici->ops->init_videobuf) {

		ret = videobuf_reqbufs(&icd->vb_vidq, p);

		if (ret < 0)

			return ret;



		ret = ici->ops->reqbufs(icd, p);

	} else {

	ret = vb2_reqbufs(&icd->vb2_vidq, p);

	}



	if (!ret)

		icd->streamer = p->count ? file : NULL;

	return ret;
@@ -393,13 +377,9 @@ static int soc_camera_querybuf(struct file *file, void *priv, 
			       struct v4l2_buffer *p)

{

	struct soc_camera_device *icd = file->private_data;

	struct soc_camera_host *ici = to_soc_camera_host(icd->parent);



	WARN_ON(priv != file->private_data);



	if (ici->ops->init_videobuf)

		return videobuf_querybuf(&icd->vb_vidq, p);

	else

	return vb2_querybuf(&icd->vb2_vidq, p);

}
@@ -407,16 +387,12 @@ static int soc_camera_qbuf(struct file *file, void *priv, 
			   struct v4l2_buffer *p)

{

	struct soc_camera_device *icd = file->private_data;

	struct soc_camera_host *ici = to_soc_camera_host(icd->parent);



	WARN_ON(priv != file->private_data);



	if (icd->streamer != file)

		return -EBUSY;



	if (ici->ops->init_videobuf)

		return videobuf_qbuf(&icd->vb_vidq, p);

	else

	return vb2_qbuf(&icd->vb2_vidq, p);

}
@@ -424,16 +400,12 @@ static int soc_camera_dqbuf(struct file *file, void *priv, 
			    struct v4l2_buffer *p)

{

	struct soc_camera_device *icd = file->private_data;

	struct soc_camera_host *ici = to_soc_camera_host(icd->parent);



	WARN_ON(priv != file->private_data);



	if (icd->streamer != file)

		return -EBUSY;



	if (ici->ops->init_videobuf)

		return videobuf_dqbuf(&icd->vb_vidq, p, file->f_flags & O_NONBLOCK);

	else

	return vb2_dqbuf(&icd->vb2_vidq, p, file->f_flags & O_NONBLOCK);

}
@@ -441,13 +413,8 @@ static int soc_camera_create_bufs(struct file *file, void *priv, 
			    struct v4l2_create_buffers *create)

{

	struct soc_camera_device *icd = file->private_data;

	struct soc_camera_host *ici = to_soc_camera_host(icd->parent);

	int ret;



	/* videobuf2 only */

	if (ici->ops->init_videobuf)

		return -ENOTTY;



	if (icd->streamer && icd->streamer != file)

		return -EBUSY;
@@ -461,12 +428,7 @@ static int soc_camera_prepare_buf(struct file *file, void *priv, 
				  struct v4l2_buffer *b)

{

	struct soc_camera_device *icd = file->private_data;

	struct soc_camera_host *ici = to_soc_camera_host(icd->parent);



	/* videobuf2 only */

	if (ici->ops->init_videobuf)

		return -EINVAL;

	else

	return vb2_prepare_buf(&icd->vb2_vidq, b);

}
@@ -474,11 +436,6 @@ static int soc_camera_expbuf(struct file *file, void *priv, 
			     struct v4l2_exportbuffer *p)

{

	struct soc_camera_device *icd = file->private_data;

	struct soc_camera_host *ici = to_soc_camera_host(icd->parent);



	/* videobuf2 only */

	if (ici->ops->init_videobuf)

		return -ENOTTY;



	if (icd->streamer && icd->streamer != file)

		return -EBUSY;
@@ -602,8 +559,6 @@ static int soc_camera_set_fmt(struct soc_camera_device *icd, 
	icd->sizeimage		= pix->sizeimage;

	icd->colorspace		= pix->colorspace;

	icd->field		= pix->field;

	if (ici->ops->init_videobuf)

		icd->vb_vidq.field = pix->field;



	dev_dbg(icd->pdev, "set width: %d height: %d\n",

		icd->user_width, icd->user_height);
@@ -745,13 +700,9 @@ static int soc_camera_open(struct file *file) 
		if (ret < 0)

			goto esfmt;



		if (ici->ops->init_videobuf) {

			ici->ops->init_videobuf(&icd->vb_vidq, icd);

		} else {

		ret = ici->ops->init_videobuf2(&icd->vb2_vidq, icd);

		if (ret < 0)

			goto einitvb;

		}

		v4l2_ctrl_handler_setup(&icd->ctrl_handler);

	}

	mutex_unlock(&ici->host_lock);
@@ -842,9 +793,6 @@ static int soc_camera_mmap(struct file *file, struct vm_area_struct *vma) 


	if (mutex_lock_interruptible(&ici->host_lock))

		return -ERESTARTSYS;

	if (ici->ops->init_videobuf)

		err = videobuf_mmap_mapper(&icd->vb_vidq, vma);

	else

	err = vb2_mmap(&icd->vb2_vidq, vma);

	mutex_unlock(&ici->host_lock);
@@ -866,9 +814,6 @@ static unsigned int soc_camera_poll(struct file *file, poll_table *pt) 
		return POLLERR;



	mutex_lock(&ici->host_lock);

	if (ici->ops->init_videobuf && list_empty(&icd->vb_vidq.stream))

		dev_err(icd->pdev, "Trying to poll with no queued buffers!\n");

	else

	res = ici->ops->poll(file, pt);

	mutex_unlock(&ici->host_lock);

	return res;
@@ -900,7 +845,7 @@ static int soc_camera_s_fmt_vid_cap(struct file *file, void *priv, 
	if (icd->streamer && icd->streamer != file)

		return -EBUSY;



	if (is_streaming(to_soc_camera_host(icd->parent), icd)) {

	if (vb2_is_streaming(&icd->vb2_vidq)) {

		dev_err(icd->pdev, "S_FMT denied: queue initialised\n");

		return -EBUSY;

	}
@@ -971,7 +916,6 @@ static int soc_camera_streamon(struct file *file, void *priv, 
			       enum v4l2_buf_type i)

{

	struct soc_camera_device *icd = file->private_data;

	struct soc_camera_host *ici = to_soc_camera_host(icd->parent);

	struct v4l2_subdev *sd = soc_camera_to_subdev(icd);

	int ret;
@@ -983,12 +927,8 @@ static int soc_camera_streamon(struct file *file, void *priv, 
	if (icd->streamer != file)

		return -EBUSY;



	/* This calls buf_queue from host driver's videobuf_queue_ops */

	if (ici->ops->init_videobuf)

		ret = videobuf_streamon(&icd->vb_vidq);

	else

	/* This calls buf_queue from host driver's videobuf2_queue_ops */

	ret = vb2_streamon(&icd->vb2_vidq, i);



	if (!ret)

		v4l2_subdev_call(sd, video, s_stream, 1);
@@ -1000,7 +940,6 @@ static int soc_camera_streamoff(struct file *file, void *priv, 
{

	struct soc_camera_device *icd = file->private_data;

	struct v4l2_subdev *sd = soc_camera_to_subdev(icd);

	struct soc_camera_host *ici = to_soc_camera_host(icd->parent);

	int ret;



	WARN_ON(priv != file->private_data);
@@ -1012,12 +951,9 @@ static int soc_camera_streamoff(struct file *file, void *priv, 
		return -EBUSY;



	/*

	 * This calls buf_release from host driver's videobuf_queue_ops for all

	 * This calls buf_release from host driver's videobuf2_queue_ops for all

	 * remaining buffers. When the last buffer is freed, stop capture

	 */

	if (ici->ops->init_videobuf)

		ret = videobuf_streamoff(&icd->vb_vidq);

	else

	ret = vb2_streamoff(&icd->vb2_vidq, i);



	v4l2_subdev_call(sd, video, s_stream, 0);
@@ -1053,7 +989,7 @@ static int soc_camera_s_selection(struct file *file, void *fh, 


	if (s->target == V4L2_SEL_TGT_COMPOSE) {

		/* No output size change during a running capture! */

		if (is_streaming(ici, icd) &&

		if (vb2_is_streaming(&icd->vb2_vidq) &&

		    (icd->user_width != s->r.width ||

		     icd->user_height != s->r.height))

			return -EBUSY;
@@ -1066,7 +1002,8 @@ static int soc_camera_s_selection(struct file *file, void *fh, 
			return -EBUSY;

	}



	if (s->target == V4L2_SEL_TGT_CROP && is_streaming(ici, icd) &&

	if (s->target == V4L2_SEL_TGT_CROP &&

	    vb2_is_streaming(&icd->vb2_vidq) &&

	    ici->ops->set_liveselection)

		ret = ici->ops->set_liveselection(icd, s);

	else
@@ -1910,9 +1847,7 @@ int soc_camera_host_register(struct soc_camera_host *ici) 
	    !ici->ops->set_fmt ||

	    !ici->ops->set_bus_param ||

	    !ici->ops->querycap ||

	    ((!ici->ops->init_videobuf ||

	      !ici->ops->reqbufs) &&

	     !ici->ops->init_videobuf2) ||

	    !ici->ops->init_videobuf2 ||

	    !ici->ops->poll ||

	    !ici->v4l2_dev.dev)

		return -EINVAL;

include/media/soc_camera.h

+1 −13
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
#include <linux/mutex.h>

#include <linux/pm.h>

#include <linux/videodev2.h>

#include <media/videobuf-core.h>

#include <media/videobuf2-v4l2.h>

#include <media/v4l2-async.h>

#include <media/v4l2-ctrls.h>
@@ -55,11 +54,8 @@ struct soc_camera_device { 
	/* Asynchronous subdevice management */

	struct soc_camera_async_client *sasc;

	/* video buffer queue */

	union {

		struct videobuf_queue vb_vidq;

	struct vb2_queue vb2_vidq;

};

};



/* Host supports programmable stride */

#define SOCAM_HOST_CAP_STRIDE		(1 << 0)
@@ -114,11 +110,8 @@ struct soc_camera_host_ops { 
	int (*set_liveselection)(struct soc_camera_device *, struct v4l2_selection *);

	int (*set_fmt)(struct soc_camera_device *, struct v4l2_format *);

	int (*try_fmt)(struct soc_camera_device *, struct v4l2_format *);

	void (*init_videobuf)(struct videobuf_queue *,

			      struct soc_camera_device *);

	int (*init_videobuf2)(struct vb2_queue *,

			      struct soc_camera_device *);

	int (*reqbufs)(struct soc_camera_device *, struct v4l2_requestbuffers *);

	int (*querycap)(struct soc_camera_host *, struct v4l2_capability *);

	int (*set_bus_param)(struct soc_camera_device *);

	int (*get_parm)(struct soc_camera_device *, struct v4l2_streamparm *);
@@ -396,11 +389,6 @@ static inline struct soc_camera_device *soc_camera_from_vb2q(const struct vb2_qu 
	return container_of(vq, struct soc_camera_device, vb2_vidq);

}



static inline struct soc_camera_device *soc_camera_from_vbq(const struct videobuf_queue *vq)

{

	return container_of(vq, struct soc_camera_device, vb_vidq);

}



static inline u32 soc_camera_grp_id(const struct soc_camera_device *icd)

{

	return (icd->iface << 8) | (icd->devnum + 1);