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

Commit ed5b65dc authored by Qing Xu's avatar Qing Xu Committed by Mauro Carvalho Chehab
Browse files

[media] V4L: soc-camera: add enum-frame-size ioctl 



add vidioc_enum_framesizes implementation, follow default_g_parm()
and g_mbus_fmt() method

Signed-off-by: default avatarQing Xu <qingx@marvell.com>
Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 03519b7e

drivers/media/video/soc_camera.c

+37 −0
Original line number Diff line number Diff line
@@ -191,6 +191,15 @@ static int soc_camera_s_std(struct file *file, void *priv, v4l2_std_id *a) 
	return v4l2_subdev_call(sd, core, s_std, *a);

}



static int soc_camera_enum_fsizes(struct file *file, void *fh,

					 struct v4l2_frmsizeenum *fsize)

{

	struct soc_camera_device *icd = file->private_data;

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



	return ici->ops->enum_fsizes(icd, fsize);

}



static int soc_camera_reqbufs(struct file *file, void *priv,

			      struct v4l2_requestbuffers *p)

{
@@ -1175,6 +1184,31 @@ static int default_s_parm(struct soc_camera_device *icd, 
	return v4l2_subdev_call(sd, video, s_parm, parm);

}



static int default_enum_fsizes(struct soc_camera_device *icd,

			  struct v4l2_frmsizeenum *fsize)

{

	int ret;

	struct v4l2_subdev *sd = soc_camera_to_subdev(icd);

	const struct soc_camera_format_xlate *xlate;

	__u32 pixfmt = fsize->pixel_format;

	struct v4l2_frmsizeenum fsize_mbus = *fsize;



	xlate = soc_camera_xlate_by_fourcc(icd, pixfmt);

	if (!xlate)

		return -EINVAL;

	/* map xlate-code to pixel_format, sensor only handle xlate-code*/

	fsize_mbus.pixel_format = xlate->code;



	ret = v4l2_subdev_call(sd, video, enum_mbus_fsizes, &fsize_mbus);

	if (ret < 0)

		return ret;



	*fsize = fsize_mbus;

	fsize->pixel_format = pixfmt;



	return 0;

}



static void soc_camera_device_init(struct device *dev, void *pdata)

{

	dev->platform_data	= pdata;
@@ -1210,6 +1244,8 @@ int soc_camera_host_register(struct soc_camera_host *ici) 
		ici->ops->set_parm = default_s_parm;

	if (!ici->ops->get_parm)

		ici->ops->get_parm = default_g_parm;

	if (!ici->ops->enum_fsizes)

		ici->ops->enum_fsizes = default_enum_fsizes;



	mutex_lock(&list_lock);

	list_for_each_entry(ix, &hosts, list) {
@@ -1317,6 +1353,7 @@ static const struct v4l2_ioctl_ops soc_camera_ioctl_ops = { 
	.vidioc_g_input		 = soc_camera_g_input,

	.vidioc_s_input		 = soc_camera_s_input,

	.vidioc_s_std		 = soc_camera_s_std,

	.vidioc_enum_framesizes  = soc_camera_enum_fsizes,

	.vidioc_reqbufs		 = soc_camera_reqbufs,

	.vidioc_try_fmt_vid_cap  = soc_camera_try_fmt_vid_cap,

	.vidioc_querybuf	 = soc_camera_querybuf,

include/media/soc_camera.h

+1 −0
Original line number Diff line number Diff line
@@ -85,6 +85,7 @@ struct soc_camera_host_ops { 
	int (*set_ctrl)(struct soc_camera_device *, struct v4l2_control *);

	int (*get_parm)(struct soc_camera_device *, struct v4l2_streamparm *);

	int (*set_parm)(struct soc_camera_device *, struct v4l2_streamparm *);

	int (*enum_fsizes)(struct soc_camera_device *, struct v4l2_frmsizeenum *);

	unsigned int (*poll)(struct file *, poll_table *);

	const struct v4l2_queryctrl *controls;

	int num_controls;