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

media: v4l2-ctrls: support g/s_ext_ctrls for requests 



The v4l2_g/s_ext_ctrls functions now support control handlers that
represent requests.

The v4l2_ctrls_find_req_obj() function is responsible for finding the
request from the fd.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Reviewed-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 6fa6f831

drivers/media/platform/omap3isp/ispvideo.c

+1 −1
Original line number Diff line number Diff line
@@ -1028,7 +1028,7 @@ static int isp_video_check_external_subdevs(struct isp_video *video, 
	ctrls.count = 1;

	ctrls.controls = &ctrl;



	ret = v4l2_g_ext_ctrls(pipe->external->ctrl_handler, &ctrls);

	ret = v4l2_g_ext_ctrls(pipe->external->ctrl_handler, NULL, &ctrls);

	if (ret < 0) {

		dev_warn(isp->dev, "no pixel rate control in subdev %s\n",

			 pipe->external->name);

drivers/media/v4l2-core/v4l2-ctrls.c

+130 −8
Original line number Diff line number Diff line
@@ -3140,7 +3140,8 @@ static int class_check(struct v4l2_ctrl_handler *hdl, u32 which) 
}



/* Get extended controls. Allocates the helpers array if needed. */

int v4l2_g_ext_ctrls(struct v4l2_ctrl_handler *hdl, struct v4l2_ext_controls *cs)

static int v4l2_g_ext_ctrls_common(struct v4l2_ctrl_handler *hdl,

				   struct v4l2_ext_controls *cs)

{

	struct v4l2_ctrl_helper helper[4];

	struct v4l2_ctrl_helper *helpers = helper;
@@ -3220,6 +3221,83 @@ int v4l2_g_ext_ctrls(struct v4l2_ctrl_handler *hdl, struct v4l2_ext_controls *cs 
		kvfree(helpers);

	return ret;

}



static struct media_request_object *

v4l2_ctrls_find_req_obj(struct v4l2_ctrl_handler *hdl,

			struct media_request *req, bool set)

{

	struct media_request_object *obj;

	struct v4l2_ctrl_handler *new_hdl;

	int ret;



	if (IS_ERR(req))

		return ERR_CAST(req);



	if (set && WARN_ON(req->state != MEDIA_REQUEST_STATE_UPDATING))

		return ERR_PTR(-EBUSY);



	obj = media_request_object_find(req, &req_ops, hdl);

	if (obj)

		return obj;

	if (!set)

		return ERR_PTR(-ENOENT);



	new_hdl = kzalloc(sizeof(*new_hdl), GFP_KERNEL);

	if (!new_hdl)

		return ERR_PTR(-ENOMEM);



	obj = &new_hdl->req_obj;

	ret = v4l2_ctrl_handler_init(new_hdl, (hdl->nr_of_buckets - 1) * 8);

	if (!ret)

		ret = v4l2_ctrl_request_bind(req, new_hdl, hdl);

	if (ret) {

		kfree(new_hdl);



		return ERR_PTR(ret);

	}



	media_request_object_get(obj);

	return obj;

}



int v4l2_g_ext_ctrls(struct v4l2_ctrl_handler *hdl, struct media_device *mdev,

		     struct v4l2_ext_controls *cs)

{

	struct media_request_object *obj = NULL;

	int ret;



	if (cs->which == V4L2_CTRL_WHICH_REQUEST_VAL) {

		struct media_request *req;



		if (!mdev || cs->request_fd < 0)

			return -EINVAL;



		req = media_request_get_by_fd(mdev, cs->request_fd);

		if (IS_ERR(req))

			return PTR_ERR(req);



		if (req->state != MEDIA_REQUEST_STATE_IDLE &&

		    req->state != MEDIA_REQUEST_STATE_COMPLETE) {

			media_request_put(req);

			return -EBUSY;

		}



		obj = v4l2_ctrls_find_req_obj(hdl, req, false);

		/* Reference to the request held through obj */

		media_request_put(req);

		if (IS_ERR(obj))

			return PTR_ERR(obj);



		hdl = container_of(obj, struct v4l2_ctrl_handler,

				   req_obj);

	}



	ret = v4l2_g_ext_ctrls_common(hdl, cs);



	if (obj)

		media_request_object_put(obj);

	return ret;

}

EXPORT_SYMBOL(v4l2_g_ext_ctrls);



/* Helper function to get a single control */
@@ -3408,9 +3486,9 @@ static void update_from_auto_cluster(struct v4l2_ctrl *master) 
}



/* Try or try-and-set controls */

static int try_set_ext_ctrls(struct v4l2_fh *fh, struct v4l2_ctrl_handler *hdl,

			     struct v4l2_ext_controls *cs,

			     bool set)

static int try_set_ext_ctrls_common(struct v4l2_fh *fh,

				    struct v4l2_ctrl_handler *hdl,

				    struct v4l2_ext_controls *cs, bool set)

{

	struct v4l2_ctrl_helper helper[4];

	struct v4l2_ctrl_helper *helpers = helper;
@@ -3523,16 +3601,60 @@ static int try_set_ext_ctrls(struct v4l2_fh *fh, struct v4l2_ctrl_handler *hdl, 
	return ret;

}



int v4l2_try_ext_ctrls(struct v4l2_ctrl_handler *hdl, struct v4l2_ext_controls *cs)

static int try_set_ext_ctrls(struct v4l2_fh *fh,

			     struct v4l2_ctrl_handler *hdl, struct media_device *mdev,

			     struct v4l2_ext_controls *cs, bool set)

{

	struct media_request_object *obj = NULL;

	struct media_request *req = NULL;

	int ret;



	if (cs->which == V4L2_CTRL_WHICH_REQUEST_VAL) {

		if (!mdev || cs->request_fd < 0)

			return -EINVAL;



		req = media_request_get_by_fd(mdev, cs->request_fd);

		if (IS_ERR(req))

			return PTR_ERR(req);



		ret = media_request_lock_for_update(req);

		if (ret) {

			media_request_put(req);

			return ret;

		}



		obj = v4l2_ctrls_find_req_obj(hdl, req, set);

		/* Reference to the request held through obj */

		media_request_put(req);

		if (IS_ERR(obj)) {

			media_request_unlock_for_update(req);

			return PTR_ERR(obj);

		}

		hdl = container_of(obj, struct v4l2_ctrl_handler,

				   req_obj);

	}



	ret = try_set_ext_ctrls_common(fh, hdl, cs, set);



	if (obj) {

		media_request_unlock_for_update(obj->req);

		media_request_object_put(obj);

	}



	return ret;

}



int v4l2_try_ext_ctrls(struct v4l2_ctrl_handler *hdl, struct media_device *mdev,

		       struct v4l2_ext_controls *cs)

{

	return try_set_ext_ctrls(NULL, hdl, cs, false);

	return try_set_ext_ctrls(NULL, hdl, mdev, cs, false);

}

EXPORT_SYMBOL(v4l2_try_ext_ctrls);



int v4l2_s_ext_ctrls(struct v4l2_fh *fh, struct v4l2_ctrl_handler *hdl,

					struct v4l2_ext_controls *cs)

		     struct media_device *mdev, struct v4l2_ext_controls *cs)

{

	return try_set_ext_ctrls(fh, hdl, cs, true);

	return try_set_ext_ctrls(fh, hdl, mdev, cs, true);

}

EXPORT_SYMBOL(v4l2_s_ext_ctrls);

drivers/media/v4l2-core/v4l2-ioctl.c

+6 −6
Original line number Diff line number Diff line
@@ -2109,9 +2109,9 @@ static int v4l_g_ext_ctrls(const struct v4l2_ioctl_ops *ops, 


	p->error_idx = p->count;

	if (vfh && vfh->ctrl_handler)

		return v4l2_g_ext_ctrls(vfh->ctrl_handler, p);

		return v4l2_g_ext_ctrls(vfh->ctrl_handler, vfd->v4l2_dev->mdev, p);

	if (vfd->ctrl_handler)

		return v4l2_g_ext_ctrls(vfd->ctrl_handler, p);

		return v4l2_g_ext_ctrls(vfd->ctrl_handler, vfd->v4l2_dev->mdev, p);

	if (ops->vidioc_g_ext_ctrls == NULL)

		return -ENOTTY;

	return check_ext_ctrls(p, 0) ? ops->vidioc_g_ext_ctrls(file, fh, p) :
@@ -2128,9 +2128,9 @@ static int v4l_s_ext_ctrls(const struct v4l2_ioctl_ops *ops, 


	p->error_idx = p->count;

	if (vfh && vfh->ctrl_handler)

		return v4l2_s_ext_ctrls(vfh, vfh->ctrl_handler, p);

		return v4l2_s_ext_ctrls(vfh, vfh->ctrl_handler, vfd->v4l2_dev->mdev, p);

	if (vfd->ctrl_handler)

		return v4l2_s_ext_ctrls(NULL, vfd->ctrl_handler, p);

		return v4l2_s_ext_ctrls(NULL, vfd->ctrl_handler, vfd->v4l2_dev->mdev, p);

	if (ops->vidioc_s_ext_ctrls == NULL)

		return -ENOTTY;

	return check_ext_ctrls(p, 0) ? ops->vidioc_s_ext_ctrls(file, fh, p) :
@@ -2147,9 +2147,9 @@ static int v4l_try_ext_ctrls(const struct v4l2_ioctl_ops *ops, 


	p->error_idx = p->count;

	if (vfh && vfh->ctrl_handler)

		return v4l2_try_ext_ctrls(vfh->ctrl_handler, p);

		return v4l2_try_ext_ctrls(vfh->ctrl_handler, vfd->v4l2_dev->mdev, p);

	if (vfd->ctrl_handler)

		return v4l2_try_ext_ctrls(vfd->ctrl_handler, p);

		return v4l2_try_ext_ctrls(vfd->ctrl_handler, vfd->v4l2_dev->mdev, p);

	if (ops->vidioc_try_ext_ctrls == NULL)

		return -ENOTTY;

	return check_ext_ctrls(p, 0) ? ops->vidioc_try_ext_ctrls(file, fh, p) :

drivers/media/v4l2-core/v4l2-subdev.c

+6 −3
Original line number Diff line number Diff line
@@ -222,17 +222,20 @@ static long subdev_do_ioctl(struct file *file, unsigned int cmd, void *arg) 
	case VIDIOC_G_EXT_CTRLS:

		if (!vfh->ctrl_handler)

			return -ENOTTY;

		return v4l2_g_ext_ctrls(vfh->ctrl_handler, arg);

		return v4l2_g_ext_ctrls(vfh->ctrl_handler,

					sd->v4l2_dev->mdev, arg);



	case VIDIOC_S_EXT_CTRLS:

		if (!vfh->ctrl_handler)

			return -ENOTTY;

		return v4l2_s_ext_ctrls(vfh, vfh->ctrl_handler, arg);

		return v4l2_s_ext_ctrls(vfh, vfh->ctrl_handler,

					sd->v4l2_dev->mdev, arg);



	case VIDIOC_TRY_EXT_CTRLS:

		if (!vfh->ctrl_handler)

			return -ENOTTY;

		return v4l2_try_ext_ctrls(vfh->ctrl_handler, arg);

		return v4l2_try_ext_ctrls(vfh->ctrl_handler,

					  sd->v4l2_dev->mdev, arg);



	case VIDIOC_DQEVENT:

		if (!(sd->flags & V4L2_SUBDEV_FL_HAS_EVENTS))

include/media/v4l2-ctrls.h

+6 −1
Original line number Diff line number Diff line
@@ -1179,11 +1179,12 @@ int v4l2_s_ctrl(struct v4l2_fh *fh, struct v4l2_ctrl_handler *hdl, 
 *	:ref:`VIDIOC_G_EXT_CTRLS <vidioc_g_ext_ctrls>` ioctl

 *

 * @hdl: pointer to &struct v4l2_ctrl_handler

 * @mdev: pointer to &struct media_device

 * @c: pointer to &struct v4l2_ext_controls

 *

 * If hdl == NULL then they will all return -EINVAL.

 */

int v4l2_g_ext_ctrls(struct v4l2_ctrl_handler *hdl,

int v4l2_g_ext_ctrls(struct v4l2_ctrl_handler *hdl, struct media_device *mdev,

		     struct v4l2_ext_controls *c);



/**
@@ -1191,11 +1192,13 @@ int v4l2_g_ext_ctrls(struct v4l2_ctrl_handler *hdl, 
 *	:ref:`VIDIOC_TRY_EXT_CTRLS <vidioc_g_ext_ctrls>` ioctl

 *

 * @hdl: pointer to &struct v4l2_ctrl_handler

 * @mdev: pointer to &struct media_device

 * @c: pointer to &struct v4l2_ext_controls

 *

 * If hdl == NULL then they will all return -EINVAL.

 */

int v4l2_try_ext_ctrls(struct v4l2_ctrl_handler *hdl,

		       struct media_device *mdev,

		       struct v4l2_ext_controls *c);



/**
@@ -1204,11 +1207,13 @@ int v4l2_try_ext_ctrls(struct v4l2_ctrl_handler *hdl, 
 *

 * @fh: pointer to &struct v4l2_fh

 * @hdl: pointer to &struct v4l2_ctrl_handler

 * @mdev: pointer to &struct media_device

 * @c: pointer to &struct v4l2_ext_controls

 *

 * If hdl == NULL then they will all return -EINVAL.

 */

int v4l2_s_ext_ctrls(struct v4l2_fh *fh, struct v4l2_ctrl_handler *hdl,

		     struct media_device *mdev,

		     struct v4l2_ext_controls *c);



/**