From: Xavier Roumegue <xavier.roumegue@oss.nxp.com>
To: mchehab@kernel.org, hverkuil-cisco@xs4all.nl,
stanimir.varbanov@linaro.org, laurent.pinchart@ideasonboard.com,
tomi.valkeinen@ideasonboard.com, robh+dt@kernel.org,
nicolas@ndufresne.ca, alexander.stein@ew.tq-group.com
Cc: linux-media@vger.kernel.org, devicetree@vger.kernel.org
Subject: [PATCH v6 06/14] v4l2-ctrls: add v4l2_ctrl_modify_dimensions
Date: Thu, 23 Jun 2022 16:31:07 +0200 [thread overview]
Message-ID: <20220623143115.3185297-7-xavier.roumegue@oss.nxp.com> (raw)
In-Reply-To: <20220623143115.3185297-1-xavier.roumegue@oss.nxp.com>
From: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
---
drivers/media/v4l2-core/v4l2-ctrls-api.c | 32 ++++++++++++++++++
include/media/v4l2-ctrls.h | 41 ++++++++++++++++++++++++
2 files changed, 73 insertions(+)
diff --git a/drivers/media/v4l2-core/v4l2-ctrls-api.c b/drivers/media/v4l2-core/v4l2-ctrls-api.c
index 6f1b72c59e8e..8c49961c47de 100644
--- a/drivers/media/v4l2-core/v4l2-ctrls-api.c
+++ b/drivers/media/v4l2-core/v4l2-ctrls-api.c
@@ -989,6 +989,38 @@ int __v4l2_ctrl_modify_range(struct v4l2_ctrl *ctrl,
}
EXPORT_SYMBOL(__v4l2_ctrl_modify_range);
+int __v4l2_ctrl_modify_dimensions(struct v4l2_ctrl *ctrl,
+ u32 dims[V4L2_CTRL_MAX_DIMS])
+{
+ unsigned int elems = dims[0];
+ unsigned int i;
+ void *p_array;
+
+ if (!ctrl->is_array || ctrl->is_dyn_array)
+ return -EINVAL;
+
+ for (i = 1; i < ctrl->nr_of_dims; i++)
+ elems *= dims[i];
+ if (elems == 0)
+ return -EINVAL;
+ p_array = kvzalloc(2 * elems * ctrl->elem_size, GFP_KERNEL);
+ if (!p_array)
+ return -ENOMEM;
+ kvfree(ctrl->p_array);
+ ctrl->p_array_alloc_elems = ctrl->elems = ctrl->new_elems = elems;
+ ctrl->p_array = p_array;
+ ctrl->p_new.p = p_array;
+ ctrl->p_cur.p = p_array + elems * ctrl->elem_size;
+ for (i = 0; i < ctrl->nr_of_dims; i++)
+ ctrl->dims[i] = dims[i];
+ for (i = 0; i < elems; i++) {
+ ctrl->type_ops->init(ctrl, i, ctrl->p_cur);
+ ctrl->type_ops->init(ctrl, i, ctrl->p_new);
+ }
+ return 0;
+}
+EXPORT_SYMBOL(__v4l2_ctrl_modify_dimensions);
+
/* Implement VIDIOC_QUERY_EXT_CTRL */
int v4l2_query_ext_ctrl(struct v4l2_ctrl_handler *hdl, struct v4l2_query_ext_ctrl *qc)
{
diff --git a/include/media/v4l2-ctrls.h b/include/media/v4l2-ctrls.h
index e0f32e8b886a..e02ce11a5844 100644
--- a/include/media/v4l2-ctrls.h
+++ b/include/media/v4l2-ctrls.h
@@ -963,6 +963,47 @@ static inline int v4l2_ctrl_modify_range(struct v4l2_ctrl *ctrl,
return rval;
}
+/**
+ *__v4l2_ctrl_modify_dimensions() - Unlocked variant of v4l2_ctrl_modify_dimensions()
+ *
+ * @ctrl: The control to update.
+ * @dims: The control's new dimensions.
+ *
+ * Update the dimensions of an array control on the fly.
+ *
+ * An error is returned if @dims is invalid for this control.
+ *
+ * The caller is responsible for acquiring the control handler mutex on behalf
+ * of __v4l2_ctrl_modify_dimensions().
+ */
+int __v4l2_ctrl_modify_dimensions(struct v4l2_ctrl *ctrl,
+ u32 dims[V4L2_CTRL_MAX_DIMS]);
+
+/**
+ * v4l2_ctrl_modify_dimensions() - Update the dimensions of an array control.
+ *
+ * @ctrl: The control to update.
+ * @dims: The control's new dimensions.
+ *
+ * Update the dimensions of a control on the fly.
+ *
+ * An error is returned if @dims is invalid for this control type.
+ *
+ * This function assumes that the control handler is not locked and will
+ * take the lock itself.
+ */
+static inline int v4l2_ctrl_modify_dimensions(struct v4l2_ctrl *ctrl,
+ u32 dims[V4L2_CTRL_MAX_DIMS])
+{
+ int rval;
+
+ v4l2_ctrl_lock(ctrl);
+ rval = __v4l2_ctrl_modify_dimensions(ctrl, dims);
+ v4l2_ctrl_unlock(ctrl);
+
+ return rval;
+}
+
/**
* v4l2_ctrl_notify() - Function to set a notify callback for a control.
*
--
2.36.1
next prev parent reply other threads:[~2022-06-23 14:32 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-23 14:31 [PATCH v6 00/14] i.MX8MP DW100 dewarper driver Xavier Roumegue
2022-06-23 14:31 ` [PATCH v6 01/14] videodev2.h: add V4L2_CTRL_FLAG_DYNAMIC_ARRAY Xavier Roumegue
2022-07-08 9:58 ` Laurent Pinchart
2022-06-23 14:31 ` [PATCH v6 02/14] v4l2-ctrls: add support for dynamically allocated arrays Xavier Roumegue
2022-06-23 14:31 ` [PATCH v6 03/14] vivid: add dynamic array test control Xavier Roumegue
2022-06-23 14:31 ` [PATCH v6 04/14] v4l2-ctrls: allocate space for arrays Xavier Roumegue
2022-06-23 14:31 ` [PATCH v6 05/14] v4l2-ctrls: alloc arrays in ctrl_ref Xavier Roumegue
2022-06-23 14:31 ` Xavier Roumegue [this message]
2022-06-23 14:31 ` [PATCH v6 07/14] v4l2-ctrls: add event Xavier Roumegue
2022-06-23 14:31 ` [PATCH v6 08/14] vivid: add pixel_array test control Xavier Roumegue
2022-06-23 14:31 ` [PATCH v6 09/14] media: Documentation: dw100: Add user documentation for the DW100 driver Xavier Roumegue
2022-06-23 14:31 ` [PATCH v6 10/14] media: v4l: uapi: Add user control base for DW100 controls Xavier Roumegue
2022-06-23 14:31 ` [PATCH v6 11/14] media: uapi: Add a control for DW100 driver Xavier Roumegue
2022-07-08 10:50 ` Laurent Pinchart
2022-06-23 14:31 ` [PATCH v6 12/14] media: dt-bindings: media: Add i.MX8MP DW100 binding Xavier Roumegue
2022-06-30 21:57 ` Rob Herring
2022-06-23 14:31 ` [PATCH v6 13/14] media: dw100: Add i.MX8MP dw100 dewarper driver Xavier Roumegue
2022-07-08 10:12 ` Hans Verkuil
2022-07-08 12:03 ` Laurent Pinchart
2022-07-08 10:48 ` Ezequiel Garcia
2022-06-23 14:31 ` [PATCH v6 14/14] media: MAINTAINERS: add entry for i.MX8MP DW100 v4l2 mem2mem driver Xavier Roumegue
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220623143115.3185297-7-xavier.roumegue@oss.nxp.com \
--to=xavier.roumegue@oss.nxp.com \
--cc=alexander.stein@ew.tq-group.com \
--cc=devicetree@vger.kernel.org \
--cc=hverkuil-cisco@xs4all.nl \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=nicolas@ndufresne.ca \
--cc=robh+dt@kernel.org \
--cc=stanimir.varbanov@linaro.org \
--cc=tomi.valkeinen@ideasonboard.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).