From patchwork Fri Sep 20 13:51:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda Delgado X-Patchwork-Id: 58864 X-Patchwork-Delegate: hverkuil@xs4all.nl Received: from vger.kernel.org ([209.132.180.67]) by www.linuxtv.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iBJKa-00046y-Hj; Fri, 20 Sep 2019 13:52:17 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387530AbfITNvq (ORCPT + 1 other); Fri, 20 Sep 2019 09:51:46 -0400 Received: from mail-ed1-f67.google.com ([209.85.208.67]:46161 "EHLO mail-ed1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727339AbfITNvp (ORCPT ); Fri, 20 Sep 2019 09:51:45 -0400 Received: by mail-ed1-f67.google.com with SMTP id t3so6446671edw.13; Fri, 20 Sep 2019 06:51:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=RBtYiphQB9xyIdpwt6uO0vAvReKHDuLowdlZ5iymKFY=; b=IOOR5spnR3XUcv/YewcXhpe4KkaW89U3LFReORwYLyUAPIWDnWjDSNYQ+N5ggD+paD bdctlg+Qeo8IPyBU1fklveGtcR6/R40A1eAwJvoYvp+i1/mE1hc4N6HWljRrHn8EqiYL EOskGWZpy+aP4t00+qx15mFjQNJwSK2kgNxRV1+Q8FcD1N5UD3IAU7mIiJw3Nl6GzUFG vcTHB3mtxSoimxWQAVDz9z1oST8rIHQYyaQF5uCto6/sfmTp4QYEh2WFD7pojy1sWC2/ es/9LNf4axKc2OBaDgf5rczdUYSJ9+mBzY5WhUTyBussdcqSpZ4QkjdWXu3d/IqlQTyz dj0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=RBtYiphQB9xyIdpwt6uO0vAvReKHDuLowdlZ5iymKFY=; b=WffXrDeVjaC21cyNABCyJp2pCEJhkGtF8NAVeRH4hV397YeBGAdUOUgVKVBiVEb5Sk 7ANemSeH5woEho+7QtGPg5134WQaIQum+++zzbbih95HadTYnBFEo3D3i35cM6RxbuFI 0xs/q51yuuBRlqq2fm8Bb334mpVUwM1lsv3zS9sgpc1ifyTutMaRirZsSIdlVsDxL9dj lzMNPoTE0Nt1FbF/qaeywHUrL7bwW8H7MKI6UpcHICrkRbHJUsZXx/SBJ+Cj9No+k6Iv jd3VLdsuIJRl1Nn3wwSH6f8IAkFluVImXK+6bu7Jd1KsZLKwQmFGlmreef4m8apRH0MS oOWw== X-Gm-Message-State: APjAAAXoo9m87wwd9pEYhNBSGn2ttSY28dKsYs9m1cW0zDI8WmYdJBmO mPoCkwH0F25zmefAM9cvE8eU2V0+tCQ= X-Google-Smtp-Source: APXvYqyuZvQJKFd+14aQ3x7lOGs4qWO9GI+hoJvLwKzEHUGLRTj7kdmSnXi6gW19XhluV3dVC4IiMQ== X-Received: by 2002:a50:d096:: with SMTP id v22mr22224201edd.81.1568987501702; Fri, 20 Sep 2019 06:51:41 -0700 (PDT) Received: from neopili.qtec.com (cpe.xe-3-0-1-778.vbrnqe10.dk.customer.tdc.net. [80.197.57.18]) by smtp.gmail.com with ESMTPSA id t30sm337673edt.91.2019.09.20.06.51.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Sep 2019 06:51:40 -0700 (PDT) From: Ricardo Ribalda Delgado To: Philipp Zabel , Hans Verkuil , Jacopo Mondi , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Ricardo Ribalda Delgado , Hans Verkuil Subject: [PATCH v6 1/7] media: v4l2-core: Implement v4l2_ctrl_new_std_compound Date: Fri, 20 Sep 2019 15:51:31 +0200 Message-Id: <20190920135137.10052-2-ricardo@ribalda.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190920135137.10052-1-ricardo@ribalda.com> References: <20190920135137.10052-1-ricardo@ribalda.com> MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Currently compound controls do not have a simple way of initializing its values. This results in ofuscated code with type_ops init. This patch introduces a new field on the control with the default value for the compound control that can be set with the brand new v4l2_ctrl_new_std_compound function Suggested-by: Hans Verkuil Signed-off-by: Ricardo Ribalda Delgado --- drivers/media/v4l2-core/v4l2-ctrls.c | 50 ++++++++++++++++++++++++---- include/media/v4l2-ctrls.h | 22 +++++++++++- 2 files changed, 64 insertions(+), 8 deletions(-) diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c index 1d8f38824631..219d8aeefa20 100644 --- a/drivers/media/v4l2-core/v4l2-ctrls.c +++ b/drivers/media/v4l2-core/v4l2-ctrls.c @@ -29,6 +29,8 @@ #define call_op(master, op) \ (has_op(master, op) ? master->ops->op(master) : 0) +static const union v4l2_ctrl_ptr ptr_null; + /* Internal temporary helper struct, one for each v4l2_ext_control */ struct v4l2_ctrl_helper { /* Pointer to the control reference of the master control */ @@ -1530,7 +1532,10 @@ static void std_init_compound(const struct v4l2_ctrl *ctrl, u32 idx, struct v4l2_ctrl_mpeg2_slice_params *p_mpeg2_slice_params; void *p = ptr.p + idx * ctrl->elem_size; - memset(p, 0, ctrl->elem_size); + if (ctrl->p_def.p) + memcpy(p, ctrl->p_def.p, ctrl->elem_size); + else + memset(p, 0, ctrl->elem_size); /* * The cast is needed to get rid of a gcc warning complaining that @@ -2354,7 +2359,8 @@ static struct v4l2_ctrl *v4l2_ctrl_new(struct v4l2_ctrl_handler *hdl, s64 min, s64 max, u64 step, s64 def, const u32 dims[V4L2_CTRL_MAX_DIMS], u32 elem_size, u32 flags, const char * const *qmenu, - const s64 *qmenu_int, void *priv) + const s64 *qmenu_int, const union v4l2_ctrl_ptr p_def, + void *priv) { struct v4l2_ctrl *ctrl; unsigned sz_extra; @@ -2460,6 +2466,9 @@ static struct v4l2_ctrl *v4l2_ctrl_new(struct v4l2_ctrl_handler *hdl, is_array) sz_extra += 2 * tot_ctrl_size; + if (type >= V4L2_CTRL_COMPOUND_TYPES && p_def.p) + sz_extra += elem_size; + ctrl = kvzalloc(sizeof(*ctrl) + sz_extra, GFP_KERNEL); if (ctrl == NULL) { handler_set_err(hdl, -ENOMEM); @@ -2503,6 +2512,12 @@ static struct v4l2_ctrl *v4l2_ctrl_new(struct v4l2_ctrl_handler *hdl, ctrl->p_new.p = &ctrl->val; ctrl->p_cur.p = &ctrl->cur.val; } + + if (type >= V4L2_CTRL_COMPOUND_TYPES && p_def.p) { + ctrl->p_def.p = ctrl->p_cur.p + tot_ctrl_size; + memcpy(ctrl->p_def.p, p_def.p, elem_size); + } + for (idx = 0; idx < elems; idx++) { ctrl->type_ops->init(ctrl, idx, ctrl->p_cur); ctrl->type_ops->init(ctrl, idx, ctrl->p_new); @@ -2554,7 +2569,7 @@ struct v4l2_ctrl *v4l2_ctrl_new_custom(struct v4l2_ctrl_handler *hdl, type, min, max, is_menu ? cfg->menu_skip_mask : step, def, cfg->dims, cfg->elem_size, - flags, qmenu, qmenu_int, priv); + flags, qmenu, qmenu_int, ptr_null, priv); if (ctrl) ctrl->is_private = cfg->is_private; return ctrl; @@ -2579,7 +2594,7 @@ struct v4l2_ctrl *v4l2_ctrl_new_std(struct v4l2_ctrl_handler *hdl, } return v4l2_ctrl_new(hdl, ops, NULL, id, name, type, min, max, step, def, NULL, 0, - flags, NULL, NULL, NULL); + flags, NULL, NULL, ptr_null, NULL); } EXPORT_SYMBOL(v4l2_ctrl_new_std); @@ -2612,7 +2627,7 @@ struct v4l2_ctrl *v4l2_ctrl_new_std_menu(struct v4l2_ctrl_handler *hdl, } return v4l2_ctrl_new(hdl, ops, NULL, id, name, type, 0, max, mask, def, NULL, 0, - flags, qmenu, qmenu_int, NULL); + flags, qmenu, qmenu_int, ptr_null, NULL); } EXPORT_SYMBOL(v4l2_ctrl_new_std_menu); @@ -2644,11 +2659,32 @@ struct v4l2_ctrl *v4l2_ctrl_new_std_menu_items(struct v4l2_ctrl_handler *hdl, } return v4l2_ctrl_new(hdl, ops, NULL, id, name, type, 0, max, mask, def, NULL, 0, - flags, qmenu, NULL, NULL); + flags, qmenu, NULL, ptr_null, NULL); } EXPORT_SYMBOL(v4l2_ctrl_new_std_menu_items); +/* Helper function for standard compound controls */ +struct v4l2_ctrl *v4l2_ctrl_new_std_compound(struct v4l2_ctrl_handler *hdl, + const struct v4l2_ctrl_ops *ops, u32 id, + const union v4l2_ctrl_ptr p_def) +{ + const char *name; + enum v4l2_ctrl_type type; + u32 flags; + s64 min, max, step, def; + + v4l2_ctrl_fill(id, &name, &type, &min, &max, &step, &def, &flags); + if (type < V4L2_CTRL_COMPOUND_TYPES) { + handler_set_err(hdl, -EINVAL); + return NULL; + } + return v4l2_ctrl_new(hdl, ops, NULL, id, name, type, + min, max, step, def, NULL, 0, + flags, NULL, NULL, p_def, NULL); +} +EXPORT_SYMBOL(v4l2_ctrl_new_std_compound); + /* Helper function for standard integer menu controls */ struct v4l2_ctrl *v4l2_ctrl_new_int_menu(struct v4l2_ctrl_handler *hdl, const struct v4l2_ctrl_ops *ops, @@ -2669,7 +2705,7 @@ struct v4l2_ctrl *v4l2_ctrl_new_int_menu(struct v4l2_ctrl_handler *hdl, } return v4l2_ctrl_new(hdl, ops, NULL, id, name, type, 0, max, 0, def, NULL, 0, - flags, NULL, qmenu_int, NULL); + flags, NULL, qmenu_int, ptr_null, NULL); } EXPORT_SYMBOL(v4l2_ctrl_new_int_menu); diff --git a/include/media/v4l2-ctrls.h b/include/media/v4l2-ctrls.h index 570ff4b0205a..4b356df850a1 100644 --- a/include/media/v4l2-ctrls.h +++ b/include/media/v4l2-ctrls.h @@ -200,6 +200,9 @@ typedef void (*v4l2_ctrl_notify_fnc)(struct v4l2_ctrl *ctrl, void *priv); * not freed when the control is deleted. Should this be needed * then a new internal bitfield can be added to tell the framework * to free this pointer. + * @p_def: The control's default value represented via a union which + * provides a standard way of accessing control types + * through a pointer (for compound controls only). * @p_cur: The control's current value represented via a union which * provides a standard way of accessing control types * through a pointer. @@ -254,6 +257,7 @@ struct v4l2_ctrl { s32 val; } cur; + union v4l2_ctrl_ptr p_def; union v4l2_ctrl_ptr p_new; union v4l2_ctrl_ptr p_cur; }; @@ -618,7 +622,6 @@ struct v4l2_ctrl *v4l2_ctrl_new_std(struct v4l2_ctrl_handler *hdl, struct v4l2_ctrl *v4l2_ctrl_new_std_menu(struct v4l2_ctrl_handler *hdl, const struct v4l2_ctrl_ops *ops, u32 id, u8 max, u64 mask, u8 def); - /** * v4l2_ctrl_new_std_menu_items() - Create a new standard V4L2 menu control * with driver specific menu. @@ -646,6 +649,23 @@ struct v4l2_ctrl *v4l2_ctrl_new_std_menu_items(struct v4l2_ctrl_handler *hdl, u64 mask, u8 def, const char * const *qmenu); +/** + * v4l2_ctrl_new_std_compound() - Allocate and initialize a new standard V4L2 + * compound control. + * + * @hdl: The control handler. + * @ops: The control ops. + * @id: The control ID. + * @p_def: The control's p_def value. + * + * Sames as v4l2_ctrl_new_std(), but with support to compound controls, thanks + * to the @p_def field. + * + */ +struct v4l2_ctrl *v4l2_ctrl_new_std_compound(struct v4l2_ctrl_handler *hdl, + const struct v4l2_ctrl_ops *ops, u32 id, + const union v4l2_ctrl_ptr p_def); + /** * v4l2_ctrl_new_int_menu() - Create a new standard V4L2 integer menu control. * From patchwork Fri Sep 20 13:51:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda Delgado X-Patchwork-Id: 58858 X-Patchwork-Delegate: hverkuil@xs4all.nl Received: from vger.kernel.org ([209.132.180.67]) by www.linuxtv.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iBJK8-000451-8J; Fri, 20 Sep 2019 13:51:48 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728700AbfITNvq (ORCPT + 1 other); Fri, 20 Sep 2019 09:51:46 -0400 Received: from mail-ed1-f68.google.com ([209.85.208.68]:39065 "EHLO mail-ed1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728680AbfITNvp (ORCPT ); Fri, 20 Sep 2019 09:51:45 -0400 Received: by mail-ed1-f68.google.com with SMTP id a15so3815955edt.6; Fri, 20 Sep 2019 06:51:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1L5wvhrcj05L6Oi0AWV9lhZy5Fef20ozg7DXeRJZdoY=; b=fZMA/bVmkqllNGlxudrFUWPeGgAjDTqB43R8nnxytMDYbzL0uKSrErQdriZiy+IT0G 5/BU1H3plBBkSYPvuCcNlivi5+TjGtGo+K07WV1tUxVIYhnrjI8diPu+LaNtbtXnVTel UGN7dd9gRLArpeLU6z7ArdXU4OQispxQJWVo+wZsihM601hj+Ubogvt9FY4yHQ6Bh10r zbIKwreXAw6kTmYZGYKt2y+OzWaDXXxYQdWRnEiin0mBD3vPubnSB0hkByTb8XSLdK7D DemO4uOdf+xDYqSKB6Wm/DCiu22qQiB7dF325s7GvORKyBIS7hc9gL79grsP1InygtbT LmRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=1L5wvhrcj05L6Oi0AWV9lhZy5Fef20ozg7DXeRJZdoY=; b=Rp3vFm7zgC5pq6/B6JP8FesnB5XBTc891AUwH0OA43gtLnZa97iiCjZ1BLlrHOnvh7 QJ2Q9UuM7seLXEQYYektfNJNTrQhgWoKWjdy23cDvnzoOodnknqiC2079pgSowZVbUJF OZ1m1gvQK5ErsT2eifFdV0lzxmCRddugrcXF0rPaJIOOwOz9uBsIFevatD7XGOf8pE2e B7wTSDNZc2wwuK2/Y98l+CrydvUJNkgSFUtqtc2xyNX5sqxtkJdMzgvrLkXP0xpvVK6R AzP0L/7vtbkQM8rI1wjiplBRhH8iCUHVT2SR3NSH9WPzoM1bdIBG3SI5KEIZ/Y7LJSRy iDpw== X-Gm-Message-State: APjAAAUlB8V/Z4B0NLUPRgx7yZcW/uJcd8M5JI5UXrOQ8Jgg458JztLj fRHX0LzjKdm/nLkfgrOWjM0= X-Google-Smtp-Source: APXvYqzOHSR71XmdJdpaj2ekazzMy4mOXgXqV6P/5OI1y+gpf3956rI/yotp/AnqfoUiYxw49BmGwQ== X-Received: by 2002:a50:f045:: with SMTP id u5mr22054997edl.297.1568987503452; Fri, 20 Sep 2019 06:51:43 -0700 (PDT) Received: from neopili.qtec.com (cpe.xe-3-0-1-778.vbrnqe10.dk.customer.tdc.net. [80.197.57.18]) by smtp.gmail.com with ESMTPSA id t30sm337673edt.91.2019.09.20.06.51.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Sep 2019 06:51:42 -0700 (PDT) From: Ricardo Ribalda Delgado To: Philipp Zabel , Hans Verkuil , Jacopo Mondi , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Ricardo Ribalda Delgado , Hans Verkuil Subject: [PATCH v6 2/7] Documentation: v4l2_ctrl_new_std_compound Date: Fri, 20 Sep 2019 15:51:32 +0200 Message-Id: <20190920135137.10052-3-ricardo@ribalda.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190920135137.10052-1-ricardo@ribalda.com> References: <20190920135137.10052-1-ricardo@ribalda.com> MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Function for initializing compound controls with a default value. Suggested-by: Hans Verkuil Signed-off-by: Ricardo Ribalda Delgado Reviewed-by: Jacopo Mondi --- Documentation/media/kapi/v4l2-controls.rst | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Documentation/media/kapi/v4l2-controls.rst b/Documentation/media/kapi/v4l2-controls.rst index ebe2a55908be..b20800cae3f2 100644 --- a/Documentation/media/kapi/v4l2-controls.rst +++ b/Documentation/media/kapi/v4l2-controls.rst @@ -140,6 +140,15 @@ Menu controls with a driver specific menu are added by calling const struct v4l2_ctrl_ops *ops, u32 id, s32 max, s32 skip_mask, s32 def, const char * const *qmenu); +Standard compound controls can be added by calling +:c:func:`v4l2_ctrl_new_std_compound`: + +.. code-block:: c + + struct v4l2_ctrl *v4l2_ctrl_new_std_compound(struct v4l2_ctrl_handler *hdl, + const struct v4l2_ctrl_ops *ops, u32 id, + const union v4l2_ctrl_ptr p_def); + Integer menu controls with a driver specific menu can be added by calling :c:func:`v4l2_ctrl_new_int_menu`: From patchwork Fri Sep 20 13:51:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda Delgado X-Patchwork-Id: 58862 X-Patchwork-Delegate: hverkuil@xs4all.nl Received: from vger.kernel.org ([209.132.180.67]) by www.linuxtv.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iBJKR-00046I-EK; Fri, 20 Sep 2019 13:52:07 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728738AbfITNwG (ORCPT + 1 other); Fri, 20 Sep 2019 09:52:06 -0400 Received: from mail-ed1-f68.google.com ([209.85.208.68]:42660 "EHLO mail-ed1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728683AbfITNvr (ORCPT ); Fri, 20 Sep 2019 09:51:47 -0400 Received: by mail-ed1-f68.google.com with SMTP id y91so6476403ede.9; Fri, 20 Sep 2019 06:51:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=A53cv7OvgdQyBG6bMsoa1KhnJmlcJtjTX/OJeLBhmDg=; b=ZY/B1H2t8MVWjgpdpSuDEFXET27GOVC93lD66/DJVc0/gSvK4S5PzvBSCyVxE5ZWxI kkKHhsnnmn4DkWx+jYEfOHjJRY0Bqd6eHNxNNJXuiX5h7u71OygHyHoz3TrQvx8AHqFS 9YEyXduWr/nClwmVzXb4fTYG4bIurKdeTvEzJjFy1JJUQJPXcTpdbdiY6ops2XPtFY5y pAGTapv5xHc99iucufUrjnl5oPYpWfUnfitLZYbk7mSDoQAUCY+xacqpyjOkVJ7h7lGa K8ffr/2OPnMioAWrwuYfbTx25NuOvFx6O0CYwPk/Rbxl7uJ+i1DTpCkHcJqbBZOSAG0X ySXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=A53cv7OvgdQyBG6bMsoa1KhnJmlcJtjTX/OJeLBhmDg=; b=X4s9B9HAGY04A9bvvcaAGUgnA5nfxdBHKwWkCIMao76NiorlfCjqxwArMKBrjnAKm1 cIe92y4bvF5eZptg4oFkj9E+2+Wnon2Ic1XtmMJIPEcimU/1Xswx/XjiNGeYbdqt6Emk 47om88SWe8xptjS36SkrcrEcOQehVj4axvmH85iSmNtooN6ot6/4z2gYjKReiNaNXpVD jW4N76jN6gJQW13u1QDgO4nAK4yRwuE/OHOlYbG9T3sTe1hzCzBYYZfAtR/GT6uVXICq ZA8I6idf53TaDFt7CZ8oj7RuFk+exMH8b17lsKxo+DmQ88BR1dZx/2oVTQ+f6uhhNIPW L8pg== X-Gm-Message-State: APjAAAU/rpUkQdItYoDleOV2byPVB94j2aRIYxK4qqXYFRe3uac2wA8u NXVUhR2tTs4lFCrXZgWaT88= X-Google-Smtp-Source: APXvYqyNhiILsEPNWuYjIaazG7IcpfbjFDWY19kpeZkc2Zfg8OmGksKwOQHB4LFidYr+27MQPchsyA== X-Received: by 2002:aa7:d844:: with SMTP id f4mr13405678eds.269.1568987505101; Fri, 20 Sep 2019 06:51:45 -0700 (PDT) Received: from neopili.qtec.com (cpe.xe-3-0-1-778.vbrnqe10.dk.customer.tdc.net. [80.197.57.18]) by smtp.gmail.com with ESMTPSA id t30sm337673edt.91.2019.09.20.06.51.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Sep 2019 06:51:43 -0700 (PDT) From: Ricardo Ribalda Delgado To: Philipp Zabel , Hans Verkuil , Jacopo Mondi , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Ricardo Ribalda Delgado Subject: [PATCH v6 3/7] media: add V4L2_CTRL_TYPE_AREA control type Date: Fri, 20 Sep 2019 15:51:33 +0200 Message-Id: <20190920135137.10052-4-ricardo@ribalda.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190920135137.10052-1-ricardo@ribalda.com> References: <20190920135137.10052-1-ricardo@ribalda.com> MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org This type contains the width and the height of a rectangular area. Signed-off-by: Ricardo Ribalda Delgado Reviewed-by: Jacopo Mondi --- drivers/media/v4l2-core/v4l2-ctrls.c | 21 ++++++++++++++ include/media/v4l2-ctrls.h | 41 ++++++++++++++++++++++++++++ include/uapi/linux/videodev2.h | 6 ++++ 3 files changed, 68 insertions(+) diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c index 219d8aeefa20..b9a46f536406 100644 --- a/drivers/media/v4l2-core/v4l2-ctrls.c +++ b/drivers/media/v4l2-core/v4l2-ctrls.c @@ -1678,6 +1678,7 @@ static int std_validate_compound(const struct v4l2_ctrl *ctrl, u32 idx, struct v4l2_ctrl_mpeg2_slice_params *p_mpeg2_slice_params; struct v4l2_ctrl_vp8_frame_header *p_vp8_frame_header; void *p = ptr.p + idx * ctrl->elem_size; + struct v4l2_area *area; switch ((u32)ctrl->type) { case V4L2_CTRL_TYPE_MPEG2_SLICE_PARAMS: @@ -1753,6 +1754,11 @@ static int std_validate_compound(const struct v4l2_ctrl *ctrl, u32 idx, zero_padding(p_vp8_frame_header->entropy_header); zero_padding(p_vp8_frame_header->coder_state); break; + case V4L2_CTRL_TYPE_AREA: + area = p; + if (!area->width || !area->height) + return -EINVAL; + break; default: return -EINVAL; } @@ -2427,6 +2433,9 @@ static struct v4l2_ctrl *v4l2_ctrl_new(struct v4l2_ctrl_handler *hdl, case V4L2_CTRL_TYPE_VP8_FRAME_HEADER: elem_size = sizeof(struct v4l2_ctrl_vp8_frame_header); break; + case V4L2_CTRL_TYPE_AREA: + elem_size = sizeof(struct v4l2_area); + break; default: if (type < V4L2_CTRL_COMPOUND_TYPES) elem_size = sizeof(s32); @@ -4116,6 +4125,18 @@ int __v4l2_ctrl_s_ctrl_string(struct v4l2_ctrl *ctrl, const char *s) } EXPORT_SYMBOL(__v4l2_ctrl_s_ctrl_string); +int __v4l2_ctrl_s_ctrl_area(struct v4l2_ctrl *ctrl, + const struct v4l2_area *area) +{ + lockdep_assert_held(ctrl->handler->lock); + + /* It's a driver bug if this happens. */ + WARN_ON(ctrl->type != V4L2_CTRL_TYPE_AREA); + memcpy(ctrl->p_new.p_area, area, sizeof(*area)); + return set_ctrl(NULL, ctrl, 0); +} +EXPORT_SYMBOL(__v4l2_ctrl_s_ctrl_area); + void v4l2_ctrl_request_complete(struct media_request *req, struct v4l2_ctrl_handler *main_hdl) { diff --git a/include/media/v4l2-ctrls.h b/include/media/v4l2-ctrls.h index 4b356df850a1..746969559ef3 100644 --- a/include/media/v4l2-ctrls.h +++ b/include/media/v4l2-ctrls.h @@ -50,6 +50,7 @@ struct poll_table_struct; * @p_h264_slice_params: Pointer to a struct v4l2_ctrl_h264_slice_params. * @p_h264_decode_params: Pointer to a struct v4l2_ctrl_h264_decode_params. * @p_vp8_frame_header: Pointer to a VP8 frame header structure. + * @p_area: Pointer to an area. * @p: Pointer to a compound value. */ union v4l2_ctrl_ptr { @@ -68,6 +69,7 @@ union v4l2_ctrl_ptr { struct v4l2_ctrl_h264_slice_params *p_h264_slice_params; struct v4l2_ctrl_h264_decode_params *p_h264_decode_params; struct v4l2_ctrl_vp8_frame_header *p_vp8_frame_header; + struct v4l2_area *p_area; void *p; }; @@ -1085,6 +1087,45 @@ static inline int v4l2_ctrl_s_ctrl_string(struct v4l2_ctrl *ctrl, const char *s) return rval; } +/** + * __v4l2_ctrl_s_ctrl_area() - Unlocked variant of v4l2_ctrl_s_ctrl_area(). + * + * @ctrl: The control. + * @area: The new area. + * + * This sets the control's new area safely by going through the control + * framework. This function assumes the control's handler is already locked, + * allowing it to be used from within the &v4l2_ctrl_ops functions. + * + * This function is for area type controls only. + */ +int __v4l2_ctrl_s_ctrl_area(struct v4l2_ctrl *ctrl, + const struct v4l2_area *area); + +/** + * v4l2_ctrl_s_ctrl_area() - Helper function to set a control's area value + * from within a driver. + * + * @ctrl: The control. + * @s: The new area. + * + * This sets the control's new area safely by going through the control + * framework. This function will lock the control's handler, so it cannot be + * used from within the &v4l2_ctrl_ops functions. + * + * This function is for area type controls only. + */ +static inline int v4l2_ctrl_s_ctrl_area(struct v4l2_ctrl *ctrl, + const struct v4l2_area *area) +{ + int rval; + + v4l2_ctrl_lock(ctrl); + rval = __v4l2_ctrl_s_ctrl_area(ctrl, area); + v4l2_ctrl_unlock(ctrl); + + return rval; +} /* Internal helper functions that deal with control events. */ extern const struct v4l2_subscribed_event_ops v4l2_ctrl_sub_ev_ops; diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h index 530638dffd93..b3c0961b62a0 100644 --- a/include/uapi/linux/videodev2.h +++ b/include/uapi/linux/videodev2.h @@ -422,6 +422,11 @@ struct v4l2_fract { __u32 denominator; }; +struct v4l2_area { + __u32 width; + __u32 height; +}; + /** * struct v4l2_capability - Describes V4L2 device caps returned by VIDIOC_QUERYCAP * @@ -1720,6 +1725,7 @@ enum v4l2_ctrl_type { V4L2_CTRL_TYPE_U8 = 0x0100, V4L2_CTRL_TYPE_U16 = 0x0101, V4L2_CTRL_TYPE_U32 = 0x0102, + V4L2_CTRL_TYPE_AREA = 0x0106, }; /* Used in the VIDIOC_QUERYCTRL ioctl for querying controls */ From patchwork Fri Sep 20 13:51:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda Delgado X-Patchwork-Id: 58861 X-Patchwork-Delegate: hverkuil@xs4all.nl Received: from vger.kernel.org ([209.132.180.67]) by www.linuxtv.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iBJKP-00046I-DL; Fri, 20 Sep 2019 13:52:05 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387551AbfITNvu (ORCPT + 1 other); Fri, 20 Sep 2019 09:51:50 -0400 Received: from mail-ed1-f65.google.com ([209.85.208.65]:45710 "EHLO mail-ed1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387536AbfITNvs (ORCPT ); Fri, 20 Sep 2019 09:51:48 -0400 Received: by mail-ed1-f65.google.com with SMTP id h33so6461023edh.12; Fri, 20 Sep 2019 06:51:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=fcQKN2FoAnIqh2MMcTmTGon9VYJKHZn6rQDUAoPW8gA=; b=F+CrL95mFF5BVyHK13mH+G7Ix0G//l04t7gw+IZu6GOske+LEUnhEhQgLfflVwr+q7 8Z0v18jt/1IHsNL7ZiWd9iENRQIogMamlx2lh6hAEoEcDg63gZu7EuZyeP7ylR5Jp6ng n7xSbiHj8TJCUnPffvBC5Bjow8O/tFVL5h5xImbQhZIQHZPDsHH8sgRhJcvmGn9Tt6YL 8tqZGaVEt1fpMWw1b/HOwxmOcdv6AsiABrqryWps2JXaRpC38Js4s4CrUEwtobEbyGz+ ZfWHj5z7lRM/FEYSmpV/BbTkByjb/Vwg0TSXAX4ptQ+hRjEzybY59XoWPPosqfNOjsb8 yvbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=fcQKN2FoAnIqh2MMcTmTGon9VYJKHZn6rQDUAoPW8gA=; b=OC9Sy5fJfu6im4fvEez1lQXGUeeCK4ZxJjRVcRaFK5acvW8rdjT9ycbkIblvbm2VA/ iDQogVrV1NQGtNUeBn8WB6RqjTckPA+uG1Z1PzZPU3oLMEFkXkYNMgzqmCrKW8JNgAEE onyb6g/CrSMP+eTy22na74lHPSm2R677ZLEC7Z332M5lZ+NhgIdZxVJLIfFxjuxcZ/Tb 3LxMlEhL5K3MNFX4hdRu39F7F9sCWXVlmQIBkSegQ3Ex17PrCJWQijTlzUbtIFa9uDQy I01LVAeHKh9GEJbJStkXDczNuyfDcMfIKfC/Eg2rtR5JzZjBNXnSGTFJZ2gMciENDk8Y wdNg== X-Gm-Message-State: APjAAAVwDIegt4RnTJh1zrhsaqtytJObY26Kz6p2RlGimdLKQ4VtamUV f/vFLmbCcCzcWMdmwQj7yDQ= X-Google-Smtp-Source: APXvYqxxoBOy/UG8BvrzxJ9tY2DrNK3pYbebxIwKwnjXKhrMIrfs3fGtQ914lFT+3FMYIhKd5KJ1dg== X-Received: by 2002:a50:d5c5:: with SMTP id g5mr22242130edj.57.1568987506574; Fri, 20 Sep 2019 06:51:46 -0700 (PDT) Received: from neopili.qtec.com (cpe.xe-3-0-1-778.vbrnqe10.dk.customer.tdc.net. [80.197.57.18]) by smtp.gmail.com with ESMTPSA id t30sm337673edt.91.2019.09.20.06.51.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Sep 2019 06:51:45 -0700 (PDT) From: Ricardo Ribalda Delgado To: Philipp Zabel , Hans Verkuil , Jacopo Mondi , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Ricardo Ribalda Delgado Subject: [PATCH v6 4/7] Documentation: media: Document V4L2_CTRL_TYPE_AREA Date: Fri, 20 Sep 2019 15:51:34 +0200 Message-Id: <20190920135137.10052-5-ricardo@ribalda.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190920135137.10052-1-ricardo@ribalda.com> References: <20190920135137.10052-1-ricardo@ribalda.com> MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org From: Ricardo Ribalda Delgado A struct v4l2_area containing the width and the height of a rectangular area. Reviewed-by: Philipp Zabel Signed-off-by: Ricardo Ribalda Delgado Reviewed-by: Jacopo Mondi --- Documentation/media/uapi/v4l/vidioc-queryctrl.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Documentation/media/uapi/v4l/vidioc-queryctrl.rst b/Documentation/media/uapi/v4l/vidioc-queryctrl.rst index a3d56ffbf4cc..33aff21b7d11 100644 --- a/Documentation/media/uapi/v4l/vidioc-queryctrl.rst +++ b/Documentation/media/uapi/v4l/vidioc-queryctrl.rst @@ -443,6 +443,12 @@ See also the examples in :ref:`control`. - n/a - A struct :c:type:`v4l2_ctrl_mpeg2_quantization`, containing MPEG-2 quantization matrices for stateless video decoders. + * - ``V4L2_CTRL_TYPE_AREA`` + - n/a + - n/a + - n/a + - A struct :c:type:`v4l2_area`, containing the width and the height + of a rectangular area. Units depend on the use case. * - ``V4L2_CTRL_TYPE_H264_SPS`` - n/a - n/a From patchwork Fri Sep 20 13:51:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda Delgado X-Patchwork-Id: 58863 X-Patchwork-Delegate: hverkuil@xs4all.nl Received: from vger.kernel.org ([209.132.180.67]) by www.linuxtv.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iBJKZ-00046y-JS; Fri, 20 Sep 2019 13:52:15 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728728AbfITNwF (ORCPT + 1 other); Fri, 20 Sep 2019 09:52:05 -0400 Received: from mail-ed1-f68.google.com ([209.85.208.68]:42665 "EHLO mail-ed1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387539AbfITNvt (ORCPT ); Fri, 20 Sep 2019 09:51:49 -0400 Received: by mail-ed1-f68.google.com with SMTP id y91so6476581ede.9; Fri, 20 Sep 2019 06:51:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9gJ7SkH/thEjmGgBZRaPpt7oGSypkEw9l6Q05cUMYTk=; b=GeRATcxHTy4pYbwd4G55V+8VL0Tr3ilwCoklzCKhfTHwVxN96PWWhUZ3dpPbV0qmxa 3u1Xjq1biXpY5txqC8Z4cJ8u3qDgrEyDRGzFEf691RzJ7RpLMEF+nLCOnc5izgyeSg9U 2sGSTIIF+nu0HWi4I4Fkzb4/lon40N+Mf5/lYv3pWID8Bdz61Id3AqJ2t4O4OM0fSDWR z40KfztRj7V3fSBRa67vzPglGwJJb0Lrf1lPfwkHfx/nH+1sOxyfk0JUPDe/o4KflCKH PizcBxSnzmE1ikmNju+VIXq2YLC+sh/SzRYZTqCrJp5kne3JCbp8F1Zlvh6F08i8VVPL SGqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=9gJ7SkH/thEjmGgBZRaPpt7oGSypkEw9l6Q05cUMYTk=; b=YnP/2rm4LyyIbgh26NXXOb1VvIKVu4yKU7ULCMzmVq5vc9VYsEI6RqyycVXNB04l+P q6bNWr/DqqeR4v6x8Ya5XuCJA9dv+8dcSOpsZTG+IwJrznESP52xuoijcNiIA+OVqiKX mopNOMWaQ0D8I/KkiJ61Ek24fZbFZbCa1pbNpRS6LAkACJifqM9l+OwbE91HWpXPEpiz 3RWXICiqbA/489HZFRpjzP5qpS0bAw7CB/L3fkUHi71hH1sVWppLdAStXUJoWUmkej07 HNMFKf8uKd6k/J/zVv5wX7ggD2BbQ2+MDNhIJ8y4VS+4BKZzdVmDwnYlDdNvqXmn8+ep ys1A== X-Gm-Message-State: APjAAAXfX0eyyDDYJjx8xaa5lstbpm0Judcz1FPyREi1rZjByA+NLNBK EAkrCURKm7Ng+qV8oaRVY5Q= X-Google-Smtp-Source: APXvYqz8DkLi0VCqu8RMoU4CkF0E5FbNTWiX0ir6J0K5xoqaq+IYeNMr7QV1ZAZSLxgqKSXTXWHMNA== X-Received: by 2002:a17:906:b6d0:: with SMTP id ec16mr19324484ejb.206.1568987507980; Fri, 20 Sep 2019 06:51:47 -0700 (PDT) Received: from neopili.qtec.com (cpe.xe-3-0-1-778.vbrnqe10.dk.customer.tdc.net. [80.197.57.18]) by smtp.gmail.com with ESMTPSA id t30sm337673edt.91.2019.09.20.06.51.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Sep 2019 06:51:47 -0700 (PDT) From: Ricardo Ribalda Delgado To: Philipp Zabel , Hans Verkuil , Jacopo Mondi , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Ricardo Ribalda Delgado Subject: [PATCH v6 5/7] media: add V4L2_CID_UNIT_CELL_SIZE control Date: Fri, 20 Sep 2019 15:51:35 +0200 Message-Id: <20190920135137.10052-6-ricardo@ribalda.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190920135137.10052-1-ricardo@ribalda.com> References: <20190920135137.10052-1-ricardo@ribalda.com> MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org From: Ricardo Ribalda Delgado This control returns the unit cell size in nanometres. The struct provides the width and the height in separated fields to take into consideration asymmetric pixels and/or hardware binning. This control is required for automatic calibration of sensors/cameras. Reviewed-by: Philipp Zabel Signed-off-by: Ricardo Ribalda Delgado --- drivers/media/v4l2-core/v4l2-ctrls.c | 5 +++++ include/uapi/linux/v4l2-controls.h | 1 + 2 files changed, 6 insertions(+) diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c index b9a46f536406..f626f9983408 100644 --- a/drivers/media/v4l2-core/v4l2-ctrls.c +++ b/drivers/media/v4l2-core/v4l2-ctrls.c @@ -996,6 +996,7 @@ const char *v4l2_ctrl_get_name(u32 id) case V4L2_CID_AUTO_FOCUS_RANGE: return "Auto Focus, Range"; case V4L2_CID_PAN_SPEED: return "Pan, Speed"; case V4L2_CID_TILT_SPEED: return "Tilt, Speed"; + case V4L2_CID_UNIT_CELL_SIZE: return "Unit Cell Size"; /* FM Radio Modulator controls */ /* Keep the order of the 'case's the same as in v4l2-controls.h! */ @@ -1377,6 +1378,10 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type, case V4L2_CID_MPEG_VIDEO_VP8_FRAME_HEADER: *type = V4L2_CTRL_TYPE_VP8_FRAME_HEADER; break; + case V4L2_CID_UNIT_CELL_SIZE: + *type = V4L2_CTRL_TYPE_AREA; + *flags |= V4L2_CTRL_FLAG_READ_ONLY; + break; default: *type = V4L2_CTRL_TYPE_INTEGER; break; diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h index a2669b79b294..5a7bedee2b0e 100644 --- a/include/uapi/linux/v4l2-controls.h +++ b/include/uapi/linux/v4l2-controls.h @@ -1034,6 +1034,7 @@ enum v4l2_jpeg_chroma_subsampling { #define V4L2_CID_TEST_PATTERN_GREENR (V4L2_CID_IMAGE_SOURCE_CLASS_BASE + 5) #define V4L2_CID_TEST_PATTERN_BLUE (V4L2_CID_IMAGE_SOURCE_CLASS_BASE + 6) #define V4L2_CID_TEST_PATTERN_GREENB (V4L2_CID_IMAGE_SOURCE_CLASS_BASE + 7) +#define V4L2_CID_UNIT_CELL_SIZE (V4L2_CID_IMAGE_SOURCE_CLASS_BASE + 8) /* Image processing controls */ From patchwork Fri Sep 20 13:51:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda Delgado X-Patchwork-Id: 58860 X-Patchwork-Delegate: hverkuil@xs4all.nl Received: from vger.kernel.org ([209.132.180.67]) by www.linuxtv.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iBJKL-00045g-5G; Fri, 20 Sep 2019 13:52:01 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387606AbfITNv7 (ORCPT + 1 other); Fri, 20 Sep 2019 09:51:59 -0400 Received: from mail-ed1-f68.google.com ([209.85.208.68]:43927 "EHLO mail-ed1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387550AbfITNvv (ORCPT ); Fri, 20 Sep 2019 09:51:51 -0400 Received: by mail-ed1-f68.google.com with SMTP id r9so6472342edl.10; Fri, 20 Sep 2019 06:51:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zoO9ckVp6bHsGgArvJADN8syjSaSq361EX8PoKgrbQ8=; b=skWvAAG3BOQRM5aNO1mUSVrRRNoiwV5Kp0qLU0Br++DdKD/YmO+tfpS/QdhQmFVMQi cx91OpQ/3b4lXA1DFm1rFaCKpz9Yqpl6U3nabr3Q8GiikQLRzjSILfbGFEcD8lqdOqu1 N7+NUDUjngyBydMktHpwQSPYOnT8clj0Lt7ZRdQzA2illEY69eK7IdjXE/dk/geBtKPm HxJmvrd6Ig2DXqRl5qN1QmodLXPOeJ0xJsz1JAG03wIvTsh2hT1s2w3scjBG66LFiGrq a8KM53zALhlGsnOJihehOUGD2ddrfZXgIsBCOpv2zptLzqyo9N2ah8Ewa1DUR4bNqFV3 4E5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=zoO9ckVp6bHsGgArvJADN8syjSaSq361EX8PoKgrbQ8=; b=ImUC8j9j7WRhTuFqrX2k3DNMjYZzAWWVbBylwjEFHZTOwxoUPorlTqEw0pXi/TRQCl rml15pJX8C3EbNADmOW5LgORkvc11NaEvBCwLzI6JUP6KgbvpxVyWHRJ+0Fg97Ypva9v LSWWxKIkleOGtD4yhIxQdOufL8fWFpGiFMik9pimnheRNeOphfL1LiowvjS+o7XrGnSD QSupsXRXrmJTfmcHCS04KNlqaQVN3mQCym8DXGpTAtA/O/IwOaKY6NAx7L4WWuGftFyx V9V2KOOPCMF+M0/YyUeQrFTttneiHvx6WlWaEg9z8P2CaX3dzAODZHOINuobNwDWG9sd Nzcg== X-Gm-Message-State: APjAAAUtMyr1HwCGLYIKayc6VsPfq6vFwXsiVnLnTo23r2Sg0F+zo3oo KMjNoR2N4n+bif7uoXQNvPw= X-Google-Smtp-Source: APXvYqy72sSGoO8AB/vtmTkGyiZJDlZHv/imCwCwJSHIWvRQAnnJnVUcX0egMVQsLk9nNekCfRDmEQ== X-Received: by 2002:aa7:dc55:: with SMTP id g21mr18237719edu.210.1568987509359; Fri, 20 Sep 2019 06:51:49 -0700 (PDT) Received: from neopili.qtec.com (cpe.xe-3-0-1-778.vbrnqe10.dk.customer.tdc.net. [80.197.57.18]) by smtp.gmail.com with ESMTPSA id t30sm337673edt.91.2019.09.20.06.51.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Sep 2019 06:51:48 -0700 (PDT) From: Ricardo Ribalda Delgado To: Philipp Zabel , Hans Verkuil , Jacopo Mondi , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Ricardo Ribalda Delgado Subject: [PATCH v6 6/7] Documentation: media: Describe V4L2_CID_UNIT_CELL_SIZE Date: Fri, 20 Sep 2019 15:51:36 +0200 Message-Id: <20190920135137.10052-7-ricardo@ribalda.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190920135137.10052-1-ricardo@ribalda.com> References: <20190920135137.10052-1-ricardo@ribalda.com> MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org From: Ricardo Ribalda Delgado New control to pass to userspace the width/height of a pixel. Which is needed for calibration and lens selection. Reviewed-by: Philipp Zabel Signed-off-by: Ricardo Ribalda Delgado --- Documentation/media/uapi/v4l/ext-ctrls-image-source.rst | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Documentation/media/uapi/v4l/ext-ctrls-image-source.rst b/Documentation/media/uapi/v4l/ext-ctrls-image-source.rst index 2c3ab5796d76..033672dcb43d 100644 --- a/Documentation/media/uapi/v4l/ext-ctrls-image-source.rst +++ b/Documentation/media/uapi/v4l/ext-ctrls-image-source.rst @@ -55,3 +55,12 @@ Image Source Control IDs ``V4L2_CID_TEST_PATTERN_GREENB (integer)`` Test pattern green (next to blue) colour component. + +``V4L2_CID_UNIT_CELL_SIZE (struct)`` + This control returns the unit cell size in nanometres. The struct + :c:type:`v4l2_area` provides the width and the height in separated + fields to take into consideration asymmetric pixels and/or hardware + binning. + The unit cell consists of the whole area of the pixel, sensitive and + non-sensitive. + This control is required for automatic calibration sensors/cameras. From patchwork Fri Sep 20 13:51:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda Delgado X-Patchwork-Id: 58859 X-Patchwork-Delegate: hverkuil@xs4all.nl Received: from vger.kernel.org ([209.132.180.67]) by www.linuxtv.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iBJKJ-00045g-H9; Fri, 20 Sep 2019 13:51:59 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387587AbfITNvy (ORCPT + 1 other); Fri, 20 Sep 2019 09:51:54 -0400 Received: from mail-ed1-f67.google.com ([209.85.208.67]:38554 "EHLO mail-ed1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387571AbfITNvw (ORCPT ); Fri, 20 Sep 2019 09:51:52 -0400 Received: by mail-ed1-f67.google.com with SMTP id l21so1684781edr.5; Fri, 20 Sep 2019 06:51:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Mip9hhM4GlCkg7XXw8v5EimNCLlBX1UP4PMrnT65eGA=; b=s+31JabZiBSdo4+9i5gb8psqbEpaYWX0NouUD8j24FHpLXBKJZT3w7DvtNwzGwgOtl F1Z4h+NjiQYYkLiap4yaq1WZ63xSG1tG5IM63/MDSq6xdXex35ABgSmVoz5tBshVGKfL TIbrCuuqKRs97G5Vvzys+NvjBAYICAUIkeitwQLtR1qJI+DfnuDG6P9Rpla+J2h5MPgn s3ftV+xDrUEVV6ieF6T1GnyZ3iuAuMLagjX3qprOKiuik51BS4Xjz1cn6CXOEWWylY17 KFgpcaheCKyeizqu8P1v1oTDB4XWrA46KcBpN+dPZD3W3hDvaB0tlk25ZBYoJldLKqGe spEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Mip9hhM4GlCkg7XXw8v5EimNCLlBX1UP4PMrnT65eGA=; b=CSguP5ZAP94nQrvMUaNg6EoX8jVD6tyETX91DSW4Aigjuhtm2p5UQRcKbCjeKrk2E7 JM2B+hOz9K2ukTH3TOj7OpXjIMp/QAt2i6H49ng6JACTm+U7JqnZP09TfvQOS9H2EG2T yeaxF3iu++d9vW1trVNYJA26xf+B49+IMGFIO7FUUx5gNttzergJjH1fz6sZT7Lvk9jx 25y8far6sF2+R71UguzvaSYfPshdWtyUgXgrSCzkHhBsDe9qzIy/qqY6rexl1XmBDRSq M2urOBO58hb80m2LmMT87sXQPMvWciYxp+rmaW2SxoKO+Ft7L+8CgUBpHATcBql4GGmP 76TQ== X-Gm-Message-State: APjAAAXBuAcEBF0z5VMMpBLOkFgTojnQQXJmOK/pjvMmOQQK5BqeC+H5 DcqBMcOgEZrVmbdQO6/lcP6HDzF2wAo= X-Google-Smtp-Source: APXvYqxm5+Jfk1GgeMe0PSir7qMXVQx82RmWbXFBTAxxk7fP+7RL3b75vrpVdOs1uQE40p3H/C5Qtw== X-Received: by 2002:a17:906:3e96:: with SMTP id a22mr3725252ejj.268.1568987510723; Fri, 20 Sep 2019 06:51:50 -0700 (PDT) Received: from neopili.qtec.com (cpe.xe-3-0-1-778.vbrnqe10.dk.customer.tdc.net. [80.197.57.18]) by smtp.gmail.com with ESMTPSA id t30sm337673edt.91.2019.09.20.06.51.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Sep 2019 06:51:49 -0700 (PDT) From: Ricardo Ribalda Delgado To: Philipp Zabel , Hans Verkuil , Jacopo Mondi , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Ricardo Ribalda Delgado Subject: [PATCH v6 7/7] media: imx214: Add new control with V4L2_CID_UNIT_CELL_SIZE Date: Fri, 20 Sep 2019 15:51:37 +0200 Message-Id: <20190920135137.10052-8-ricardo@ribalda.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190920135137.10052-1-ricardo@ribalda.com> References: <20190920135137.10052-1-ricardo@ribalda.com> MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org From: Ricardo Ribalda Delgado According to the product brief, the unit cell size is 1120 nanometers^2. https://www.sony-semicon.co.jp/products_en/IS/sensor1/img/products/ProductBrief_IMX214_20150428.pdf Signed-off-by: Ricardo Ribalda Delgado --- drivers/media/i2c/imx214.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/media/i2c/imx214.c b/drivers/media/i2c/imx214.c index 159a3a604f0e..57562e20c4ca 100644 --- a/drivers/media/i2c/imx214.c +++ b/drivers/media/i2c/imx214.c @@ -47,6 +47,7 @@ struct imx214 { struct v4l2_ctrl *pixel_rate; struct v4l2_ctrl *link_freq; struct v4l2_ctrl *exposure; + struct v4l2_ctrl *unit_size; struct regulator_bulk_data supplies[IMX214_NUM_SUPPLIES]; @@ -948,6 +949,13 @@ static int imx214_probe(struct i2c_client *client) static const s64 link_freq[] = { IMX214_DEFAULT_LINK_FREQ, }; + struct v4l2_area unit_size = { + .width = 1120, + .height = 1120, + }; + union v4l2_ctrl_ptr p_def = { + .p_area = &unit_size, + }; int ret; ret = imx214_parse_fwnode(dev); @@ -1029,6 +1037,10 @@ static int imx214_probe(struct i2c_client *client) V4L2_CID_EXPOSURE, 0, 3184, 1, 0x0c70); + imx214->unit_size = v4l2_ctrl_new_std_compound(&imx214->ctrls, + NULL, + V4L2_CID_UNIT_CELL_SIZE, + p_def); ret = imx214->ctrls.error; if (ret) { dev_err(&client->dev, "%s control init failed (%d)\n",