From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id EAB5CC54E65 for ; Thu, 22 May 2025 17:12:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Message-ID:Date:To:Cc:From: Subject:References:In-Reply-To:Content-Transfer-Encoding:MIME-Version: Content-Type:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=xHJB+u61ePIcOFVW9PEytr8u70GjU5bGai19BvD0mC0=; b=4fg0bzalWFs/1wuA4ZUnpJP7z7 qb+K7Fe8rRPnWzif2jWAXeuO9TSjGUFsN9zDyIFhBJe7MJMpfDRfmDAJ4401Youybj3+5KwLumoU1 hJ1s9Zz0izk8tWMRksaPzHX7cq7JbPSWc2P6XuuI4hckaqsJTMhpmQ2YWFtDn4eJPyuHzlHCQlozk V8f9WGg8IlIMy57fJX1on7HWnQYe/G7Cj8R7WfFw9ukoCRcKjU1dCnhCx5tgVz8IBk2cr31a+2t9p c+pF0RgnpkVVn7wPo2K3QceoPjrMB9qeoiTAoebzmtX9LwWhqf+3vQ/rnTe9bgFQYPSS0t76ohNR2 LDNerZeA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1uI9TM-00000001iKd-3SDS; Thu, 22 May 2025 17:12:48 +0000 Received: from perceval.ideasonboard.com ([213.167.242.64]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1uI9RK-00000001hzP-1NAQ; Thu, 22 May 2025 17:10:43 +0000 Received: from ideasonboard.com (unknown [IPv6:2a00:6020:448c:6c00:30c3:8bbb:632f:b0c9]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 0F0B08FA; Thu, 22 May 2025 19:10:19 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1747933819; bh=5I+mCo9Rfn+JANqW/C9UsNHsAbUMsXfkGjWI+jSdAVU=; h=In-Reply-To:References:Subject:From:Cc:To:Date:From; b=oKuHbQBydbdOY2dIs6/V78qBYaMl+H4LSjp21lrvutx/2zOxgOaGwr6K418Ok+gsd zCQkikluExWShsOlIsvMKFUWoFz+dXF/IZJ+CvJhLvTE0ctwYKa0T2Lrv3V1H2rWhx DhZF01FID21lU+Z/KC+z1TJuc0N+Koo5642s4+a4= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable In-Reply-To: <20250522164147.GV12514@pendragon.ideasonboard.com> References: <20250522150944.400046-2-stefan.klug@ideasonboard.com> <20250522150944.400046-4-stefan.klug@ideasonboard.com> <20250522155641.GU12514@pendragon.ideasonboard.com> <174793176608.244022.1396416000017796106@localhost> <20250522164147.GV12514@pendragon.ideasonboard.com> Subject: Re: [PATCH 2/3] media: rkisp1: Add RKISP1_CID_SUPPORTED_PARAMS_BLOCKS control From: Stefan Klug Cc: linux-media@vger.kernel.org, Dafna Hirschfeld , Mauro Carvalho Chehab , Heiko Stuebner , linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Hans Verkuil To: Laurent Pinchart Date: Thu, 22 May 2025 19:10:38 +0200 Message-ID: <174793383823.244022.8319148306028952702@localhost> User-Agent: alot/0.12.dev16+g501a9541e2e6.d20250519 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250522_101042_511175_9CC92109 X-CRM114-Status: GOOD ( 43.88 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Quoting Laurent Pinchart (2025-05-22 18:41:47) > On Thu, May 22, 2025 at 06:36:06PM +0200, Stefan Klug wrote: > > Hi Laurent, > >=20 > > Thank you for the review. > >=20 > > Quoting Laurent Pinchart (2025-05-22 17:56:41) > > > Hi Stefan, > > >=20 > > > Thank you for the patch. > > >=20 > > > On Thu, May 22, 2025 at 05:08:39PM +0200, Stefan Klug wrote: > > > > Add a RKISP1_CID_SUPPORTED_PARAMS_BLOCKS V4L2 control to be able to > > > > query the parameters blocks supported by the current kernel on the > > > > current hardware from user space. > > > >=20 > > > > Signed-off-by: Stefan Klug > > > > --- > > > > .../platform/rockchip/rkisp1/rkisp1-common.h | 2 + > > > > .../platform/rockchip/rkisp1/rkisp1-params.c | 50 +++++++++++++++= +++- > > > > include/uapi/linux/rkisp1-config.h | 10 ++++ > > > > include/uapi/linux/v4l2-controls.h | 6 +++ > > > > 4 files changed, 67 insertions(+), 1 deletion(-) > > > >=20 > > > > diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h= b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h > > > > index ca952fd0829b..5f187f9efc7b 100644 > > > > --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h > > > > +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h > > > > @@ -415,6 +415,8 @@ struct rkisp1_params { > > > > spinlock_t config_lock; /* locks the buffers list 'params' */ > > > > struct list_head params; > > > > =20 > > > > + struct v4l2_ctrl_handler ctrls; > > > > + > > > > const struct v4l2_meta_format *metafmt; > > > > =20 > > > > enum v4l2_quantization quantization; > > > > diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c= b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c > > > > index 918eb06c7465..60c9b3c46593 100644 > > > > --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c > > > > +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c > > > > @@ -2736,6 +2736,45 @@ static int rkisp1_params_init_vb2_queue(stru= ct vb2_queue *q, > > > > return vb2_queue_init(q); > > > > } > > > > =20 > > > > +static int rkisp1_ctrl_init(struct rkisp1_params *params) > > > > +{ > > > > + int ret; > > > > + > > > > + v4l2_ctrl_handler_init(¶ms->ctrls, 1); > > > > + > > > > + struct v4l2_ctrl_config ctrl_config =3D { > > > > + .id =3D RKISP1_CID_SUPPORTED_PARAMS_BLOCKS, > > > > + .name =3D "Supported Params Blocks", > > > > + .type =3D V4L2_CTRL_TYPE_BITMASK, > > > > + .flags =3D V4L2_CTRL_FLAG_READ_ONLY, > > > > + }; > > >=20 > > > struct v4l2_ctrl_config ctrl_config =3D { > > > .id =3D RKISP1_CID_SUPPORTED_PARAMS_BLOCKS, > > > .name =3D "Supported Params Blocks", > > > .type =3D V4L2_CTRL_TYPE_BITMASK, > > > .flags =3D V4L2_CTRL_FLAG_READ_ONLY, > > > }; > > > int ret; > > >=20 > > > v4l2_ctrl_handler_init(¶ms->ctrls, 1); > > >=20 > > > Mixing code and variable declarations is still usually frown upon in = the > > > kernel. > >=20 > > I thought frown upon is not a no. And as this structure is not yet > > complete and is modified afterwards it feels natural to me to put it > > close to that place. But I can move it above the function. You decide. >=20 > It obviously take someone to make the first move for things to change > :-) I however tend to favour consistency in coding style within a > driver. Ahh, maybe I misread the comment. You meant to move it above ret. Not outside the function. Right? That is easy to do. And I saw that pattern in vivid-ctrls.c Regards, Stefan >=20 > > > > + > > > > + for (unsigned int i =3D 0; i < ARRAY_SIZE(rkisp1_ext_params_h= andlers); i++) { > > > > + const struct rkisp1_ext_params_handler *block_handler; > > > > + > > > > + block_handler =3D &rkisp1_ext_params_handlers[i]; > > > > + ctrl_config.max |=3D BIT(i); > > > > + > > > > + if ((params->rkisp1->info->features & block_handler->= features) !=3D > > > > + block_handler->features) > > > > + continue; > > > > + > > > > + ctrl_config.def |=3D BIT(i); > > > > + } > > > > + > > > > + v4l2_ctrl_new_custom(¶ms->ctrls, &ctrl_config, NULL); > > > > + > > > > + params->vnode.vdev.ctrl_handler =3D ¶ms->ctrls; > > > > + > > > > + if (params->ctrls.error) { > > > > + ret =3D params->ctrls.error; > > > > + v4l2_ctrl_handler_free(¶ms->ctrls); > > > > + return ret; > > > > + } > > > > + > > > > + return 0; > > > > +} > > > > + > > > > int rkisp1_params_register(struct rkisp1_device *rkisp1) > > > > { > > > > struct rkisp1_params *params =3D &rkisp1->params; > > > > @@ -2776,10 +2815,16 @@ int rkisp1_params_register(struct rkisp1_de= vice *rkisp1) > > > > =20 > > > > video_set_drvdata(vdev, params); > > > > =20 > > > > + ret =3D rkisp1_ctrl_init(params); > > > > + if (ret) { > > > > + dev_err(rkisp1->dev, "Control initialization error %d= \n", ret); > > > > + goto err_mutex; > > > > + } > > > > + > > > > node->pad.flags =3D MEDIA_PAD_FL_SOURCE; > > > > ret =3D media_entity_pads_init(&vdev->entity, 1, &node->pad); > > > > if (ret) > > > > - goto err_mutex; > > > > + goto err_ctrl; > > > > =20 > > > > ret =3D video_register_device(vdev, VFL_TYPE_VIDEO, -1); > > > > if (ret) { > > > > @@ -2792,6 +2837,8 @@ int rkisp1_params_register(struct rkisp1_devi= ce *rkisp1) > > > > =20 > > > > err_media: > > > > media_entity_cleanup(&vdev->entity); > > > > +err_ctrl: > > > > + v4l2_ctrl_handler_free(¶ms->ctrls); > > > > err_mutex: > > > > mutex_destroy(&node->vlock); > > > > return ret; > > > > @@ -2808,5 +2855,6 @@ void rkisp1_params_unregister(struct rkisp1_d= evice *rkisp1) > > > > =20 > > > > vb2_video_unregister_device(vdev); > > > > media_entity_cleanup(&vdev->entity); > > > > + v4l2_ctrl_handler_free(¶ms->ctrls); > > > > mutex_destroy(&node->vlock); > > > > } > > > > diff --git a/include/uapi/linux/rkisp1-config.h b/include/uapi/linu= x/rkisp1-config.h > > > > index 2d995f3c1ca3..4fc8f221d0c4 100644 > > > > --- a/include/uapi/linux/rkisp1-config.h > > > > +++ b/include/uapi/linux/rkisp1-config.h > > > > @@ -1086,6 +1086,9 @@ enum rkisp1_ext_params_block_type { > > > > #define RKISP1_EXT_PARAMS_FL_BLOCK_DISABLE (1U << 0) > > > > #define RKISP1_EXT_PARAMS_FL_BLOCK_ENABLE (1U << 1) > > > > =20 > > > > +/* A bitmask of parameters blocks supported on the current hardwar= e. */ > > > > +#define RKISP1_CID_SUPPORTED_PARAMS_BLOCKS (V4L2_CID_USER_RKISP1= _BASE + 0x01) > > > > + > > > > /** > > > > * struct rkisp1_ext_params_block_header - RkISP1 extensible param= eters block > > > > * header > > > > @@ -1520,6 +1523,13 @@ enum rksip1_ext_param_buffer_version { > > > > * V4L2 control. If such control is not available, userspace shoul= d assume only > > > > * RKISP1_EXT_PARAM_BUFFER_V1 is supported by the driver. > > > > * > > > > + * The read-only V4L2 control ``RKISP1_CID_SUPPORTED_PARAMS_BLOCKS= `` can be used > > > > + * to query the blocks supported by the current hardware. It conta= ins a bitmask > > >=20 > > > s/current hardware/device/ > > >=20 > > > > + * where each bit represents the availability of the corresponding= entry > > > > + * from the :c:type:`rkisp1_ext_params_block_type` enum. The max v= alue of the > > > > + * control represents the blocks supported by the current kernel (= independent of > > > > + * the current hardware). > > >=20 > > > * from the :c:type:`rkisp1_ext_params_block_type` enum. The current = and default > > > * values of the control represents the blocks supported by the devic= e instance, > > > * while the maximum value represents the blocks supported by the ker= nel driver, > > > * independently of the device instance. > > >=20 > > > I was going to say that the control should be documented in > > > Documentation/userspace-api/drivers/rkisp1.rst, but rkisp1-config.h is > > > pulled in the documentation tree by > > > Documentation/userspace-api/media/v4l/metafmt-rkisp1.rst, so I'm OK w= ith > > > this. Hans, Mauro, are you fine as well with documenting the control > > > here ? > >=20 > > Looking at the docs, I realized that most people will read the already > > existing docs. So creating a completely new file just for the single > > control didn't feel good. As you like. > >=20 > > > Reviewed-by: Laurent Pinchart > > >=20 > > > > + * > > > > * For each ISP block that userspace wants to configure, a block-s= pecific > > > > * structure is appended to the @data buffer, one after the other = without gaps > > > > * in between nor overlaps. Userspace shall populate the @data_siz= e field with > > > > diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linu= x/v4l2-controls.h > > > > index 72e32814ea83..f836512e9deb 100644 > > > > --- a/include/uapi/linux/v4l2-controls.h > > > > +++ b/include/uapi/linux/v4l2-controls.h > > > > @@ -222,6 +222,12 @@ enum v4l2_colorfx { > > > > */ > > > > #define V4L2_CID_USER_UVC_BASE (V4L2_CID_USE= R_BASE + 0x11e0) > > > > =20 > > > > +/* > > > > + * The base for Rockchip ISP1 driver controls. > > > > + * We reserve 16 controls for this driver. > > > > + */ > > > > +#define V4L2_CID_USER_RKISP1_BASE (V4L2_CID_USER_BASE += 0x1220) > > > > + > > > > /* MPEG-class control IDs */ > > > > /* The MPEG controls are applicable to all codec controls > > > > * and the 'MPEG' part of the define is historical */ >=20 > --=20 > Regards, >=20 > Laurent Pinchart