From nobody Tue Nov 26 08:50:39 2024 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 995DC1991AE; Sun, 20 Oct 2024 22:14:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729462452; cv=none; b=Sf0EW0JyQlizHC1PFS7CtcvwSJX2vPMCMmPtba5h9by9iipG2Mt5wywRnH247Z/5M3JXVJGvY6MLG2yMC7PPrVw2hDVwwCH6Y+AybywdANIF5Q0OA1J8Zyt2gGNLLr/+dIvnz0pXZ9YcLyin2rh981XdCbJ9I2Ocfh0pILn2Cu4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729462452; c=relaxed/simple; bh=F3MrsPjtAQxIjxa6dFnrymf6keuvQ2LN92RtvGSyzco=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=cDL6CvPTrbKRD55Al/biofCSKYwZE3c5CwyWsIYnyd/LsSBq7a37hhoQLdKYcNr7sTc5HAGGXNAPlXV7/w9hfooXsoe6JmTfsm+nUqXFVBGooLYj2hFYkRqG1TM85oWyLqO9DuWfXXoeWSZWj1oWCoEoBiAk9ku2kF9K2HyKAs8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=kYW1APf5; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="kYW1APf5" Received: by smtp.kernel.org (Postfix) with ESMTPS id 18724C4CEF4; Sun, 20 Oct 2024 22:14:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1729462452; bh=F3MrsPjtAQxIjxa6dFnrymf6keuvQ2LN92RtvGSyzco=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=kYW1APf5kRkKk7FWrXBNxl19Ym94fR0114z5Zn3qf/tFAls5cjmULT987eshH4bYp hK4l/thOOZAZ+Swr8y2gxlFwoKHHCriKGaXQFnBPJXSGVdkbkKSXppA+E2KWAGAsHc KQ50aRWwkC6/oZPPJmQ+0zRBKFRMjGBqKBcRqP/BElnGktHia8tOD0NlVpcP0VD2of EejUWCNVqO4Uw/TY3QBGu7oqONCUHJpbP9G3p12+E1t2faeu+0eSLazmPbe9QLFo/1 P8fT7oyvPnte9DV9Z806VPGuPHp2Rbk8bNtle54FJn0vLfQxH0iYvClYWELUs7/Xvm NvbiQ7dQhTMMw== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0D7EED3C930; Sun, 20 Oct 2024 22:14:12 +0000 (UTC) From: =?utf-8?q?Andr=C3=A9_Apitzsch_via_B4_Relay?= Date: Mon, 21 Oct 2024 00:13:28 +0200 Subject: [PATCH v2 08/13] media: i2c: imx214: Add vblank and hblank controls Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20241021-imx214-v2-8-fbd23e99541e@apitzsch.eu> References: <20241021-imx214-v2-0-fbd23e99541e@apitzsch.eu> In-Reply-To: <20241021-imx214-v2-0-fbd23e99541e@apitzsch.eu> To: Ricardo Ribalda , Mauro Carvalho Chehab , Sakari Ailus Cc: ~postmarketos/upstreaming@lists.sr.ht, phone-devel@vger.kernel.org, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Dave Stevenson , =?utf-8?q?Andr=C3=A9_Apitzsch?= X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1729462449; l=8667; i=git@apitzsch.eu; s=20240325; h=from:subject:message-id; bh=RplBzbTpfNes4EIKFHGO0oVof5BqK3Mdu/t1OsfqH3o=; b=CJecofuZ1CLuS+5bfWeF1TNhUaPvj7MiteElO5m8rGnrv2i+S8qy92lxo5vws0CIoRuH+me+z Agdqk0XgaglC8Dx+txqhXTvcvecle5L7i81VAVD624pEUJosoW+Jglt X-Developer-Key: i=git@apitzsch.eu; a=ed25519; pk=wxovcZRfvNYBMcTw4QFFtNEP4qv39gnBfnfyImXZxiU= X-Endpoint-Received: by B4 Relay for git@apitzsch.eu/20240325 with auth_id=142 X-Original-From: =?utf-8?q?Andr=C3=A9_Apitzsch?= Reply-To: git@apitzsch.eu From: Andr=C3=A9 Apitzsch Add vblank control to allow changing the framerate / higher exposure values. The vblank and hblank controls are needed for libcamera support. While at it, fix the minimal exposure time according to the datasheet. Signed-off-by: Andr=C3=A9 Apitzsch --- drivers/media/i2c/imx214.c | 119 ++++++++++++++++++++++++++++++++++++-----= ---- 1 file changed, 97 insertions(+), 22 deletions(-) diff --git a/drivers/media/i2c/imx214.c b/drivers/media/i2c/imx214.c index 497baad616ad7374a92a3da2b7c1096b1d72a0c7..cb443d8bee6fe72dc9378b2c2d3= caae09f8642c5 100644 --- a/drivers/media/i2c/imx214.c +++ b/drivers/media/i2c/imx214.c @@ -34,11 +34,18 @@ =20 /* V-TIMING internal */ #define IMX214_REG_FRM_LENGTH_LINES CCI_REG16(0x0340) +#define IMX214_VTS_MAX 0xffff + +#define IMX214_VBLANK_MIN 890 + +/* HBLANK control - read only */ +#define IMX214_PPL_DEFAULT 5008 =20 /* Exposure control */ #define IMX214_REG_EXPOSURE CCI_REG16(0x0202) -#define IMX214_EXPOSURE_MIN 0 -#define IMX214_EXPOSURE_MAX 3184 +#define IMX214_EXPOSURE_OFFSET 10 +#define IMX214_EXPOSURE_MIN 1 +#define IMX214_EXPOSURE_MAX (IMX214_VTS_MAX - IMX214_EXPOSURE_OFFSET) #define IMX214_EXPOSURE_STEP 1 #define IMX214_EXPOSURE_DEFAULT 3184 #define IMX214_REG_EXPOSURE_RATIO CCI_REG8(0x0222) @@ -187,6 +194,8 @@ struct imx214 { struct v4l2_ctrl_handler ctrls; struct v4l2_ctrl *pixel_rate; struct v4l2_ctrl *link_freq; + struct v4l2_ctrl *vblank; + struct v4l2_ctrl *hblank; struct v4l2_ctrl *exposure; struct v4l2_ctrl *unit_size; =20 @@ -202,8 +211,6 @@ static const struct cci_reg_sequence mode_4096x2304[] = =3D { { IMX214_REG_HDR_MODE, IMX214_HDR_MODE_OFF }, { IMX214_REG_HDR_RES_REDUCTION, IMX214_HDR_RES_REDU_THROUGH }, { IMX214_REG_EXPOSURE_RATIO, 1 }, - { IMX214_REG_FRM_LENGTH_LINES, 3194 }, - { IMX214_REG_LINE_LENGTH_PCK, 5008 }, { IMX214_REG_X_ADD_STA, 56 }, { IMX214_REG_Y_ADD_STA, 408 }, { IMX214_REG_X_ADD_END, 4151 }, @@ -274,8 +281,6 @@ static const struct cci_reg_sequence mode_1920x1080[] = =3D { { IMX214_REG_HDR_MODE, IMX214_HDR_MODE_OFF }, { IMX214_REG_HDR_RES_REDUCTION, IMX214_HDR_RES_REDU_THROUGH }, { IMX214_REG_EXPOSURE_RATIO, 1 }, - { IMX214_REG_FRM_LENGTH_LINES, 3194 }, - { IMX214_REG_LINE_LENGTH_PCK, 5008 }, { IMX214_REG_X_ADD_STA, 1144 }, { IMX214_REG_Y_ADD_STA, 1020 }, { IMX214_REG_X_ADD_END, 3063 }, @@ -359,6 +364,7 @@ static const struct cci_reg_sequence mode_table_common[= ] =3D { { IMX214_REG_ORIENTATION, 0 }, { IMX214_REG_MASK_CORR_FRAMES, IMX214_CORR_FRAMES_MASK }, { IMX214_REG_FAST_STANDBY_CTRL, 1 }, + { IMX214_REG_LINE_LENGTH_PCK, IMX214_PPL_DEFAULT }, { CCI_REG8(0x4550), 0x02 }, { CCI_REG8(0x4601), 0x00 }, { CCI_REG8(0x4642), 0x05 }, @@ -462,18 +468,24 @@ static const struct cci_reg_sequence mode_table_commo= n[] =3D { static const struct imx214_mode { u32 width; u32 height; + + /* V-timing */ + unsigned int vts_def; + unsigned int num_of_regs; const struct cci_reg_sequence *reg_table; } imx214_modes[] =3D { { .width =3D 4096, .height =3D 2304, + .vts_def =3D 3194, .num_of_regs =3D ARRAY_SIZE(mode_4096x2304), .reg_table =3D mode_4096x2304, }, { .width =3D 1920, .height =3D 1080, + .vts_def =3D 3194, .num_of_regs =3D ARRAY_SIZE(mode_1920x1080), .reg_table =3D mode_1920x1080, }, @@ -629,9 +641,39 @@ static int imx214_set_format(struct v4l2_subdev *sd, __crop->width =3D mode->width; __crop->height =3D mode->height; =20 - if (format->which =3D=3D V4L2_SUBDEV_FORMAT_ACTIVE) + if (format->which =3D=3D V4L2_SUBDEV_FORMAT_ACTIVE) { + int exposure_max; + int exposure_def; + int hblank; + imx214->cur_mode =3D mode; =20 + /* Update limits and set FPS to default */ + __v4l2_ctrl_modify_range(imx214->vblank, IMX214_VBLANK_MIN, + IMX214_VTS_MAX - mode->height, 2, + mode->vts_def - mode->height); + __v4l2_ctrl_s_ctrl(imx214->vblank, + mode->vts_def - mode->height); + + /* Update max exposure while meeting expected vblanking */ + exposure_max =3D mode->vts_def - IMX214_EXPOSURE_OFFSET; + exposure_def =3D (exposure_max < IMX214_EXPOSURE_DEFAULT) ? + exposure_max : IMX214_EXPOSURE_DEFAULT; + __v4l2_ctrl_modify_range(imx214->exposure, + imx214->exposure->minimum, + exposure_max, imx214->exposure->step, + exposure_def); + + /* + * Currently PPL is fixed to IMX214_PPL_DEFAULT, so hblank + * depends on mode->width only, and is not changeble in any + * way other than changing the mode. + */ + hblank =3D IMX214_PPL_DEFAULT - mode->width; + __v4l2_ctrl_modify_range(imx214->hblank, hblank, hblank, 1, + hblank); + } + return 0; } =20 @@ -681,8 +723,25 @@ static int imx214_set_ctrl(struct v4l2_ctrl *ctrl) { struct imx214 *imx214 =3D container_of(ctrl->handler, struct imx214, ctrls); + const struct v4l2_mbus_framefmt *format; + struct v4l2_subdev_state *state; int ret; =20 + state =3D v4l2_subdev_get_locked_active_state(&imx214->sd); + format =3D v4l2_subdev_state_get_format(state, 0); + + if (ctrl->id =3D=3D V4L2_CID_VBLANK) { + int exposure_max, exposure_def; + + /* Update max exposure while meeting expected vblanking */ + exposure_max =3D format->height + ctrl->val - IMX214_EXPOSURE_OFFSET; + exposure_def =3D min(exposure_max, IMX214_EXPOSURE_DEFAULT); + __v4l2_ctrl_modify_range(imx214->exposure, + imx214->exposure->minimum, + exposure_max, imx214->exposure->step, + exposure_def); + } + /* * Applying V4L2 control value only happens * when power is up for streaming @@ -694,7 +753,10 @@ static int imx214_set_ctrl(struct v4l2_ctrl *ctrl) case V4L2_CID_EXPOSURE: cci_write(imx214->regmap, IMX214_REG_EXPOSURE, ctrl->val, &ret); break; - + case V4L2_CID_VBLANK: + cci_write(imx214->regmap, IMX214_REG_FRM_LENGTH_LINES, + format->height + ctrl->val, &ret); + break; default: ret =3D -EINVAL; } @@ -717,8 +779,11 @@ static int imx214_ctrls_init(struct imx214 *imx214) .width =3D 1120, .height =3D 1120, }; + const struct imx214_mode *mode =3D &imx214_modes[0]; struct v4l2_fwnode_device_properties props; struct v4l2_ctrl_handler *ctrl_hdlr; + int exposure_max, exposure_def; + int hblank; int ret; =20 ret =3D v4l2_fwnode_device_parse(imx214->dev, &props); @@ -726,7 +791,7 @@ static int imx214_ctrls_init(struct imx214 *imx214) return ret; =20 ctrl_hdlr =3D &imx214->ctrls; - ret =3D v4l2_ctrl_handler_init(&imx214->ctrls, 6); + ret =3D v4l2_ctrl_handler_init(&imx214->ctrls, 8); if (ret) return ret; =20 @@ -742,22 +807,26 @@ static int imx214_ctrls_init(struct imx214 *imx214) if (imx214->link_freq) imx214->link_freq->flags |=3D V4L2_CTRL_FLAG_READ_ONLY; =20 - /* - * WARNING! - * Values obtained reverse engineering blobs and/or devices. - * Ranges and functionality might be wrong. - * - * Sony, please release some register set documentation for the - * device. - * - * Yours sincerely, Ricardo. - */ + /* Initial vblank/hblank/exposure parameters based on current mode */ + imx214->vblank =3D v4l2_ctrl_new_std(ctrl_hdlr, &imx214_ctrl_ops, + V4L2_CID_VBLANK, IMX214_VBLANK_MIN, + IMX214_VTS_MAX - mode->height, 2, + mode->vts_def - mode->height); + + hblank =3D IMX214_PPL_DEFAULT - mode->width; + imx214->hblank =3D v4l2_ctrl_new_std(ctrl_hdlr, &imx214_ctrl_ops, + V4L2_CID_HBLANK, hblank, hblank, + 1, hblank); + if (imx214->hblank) + imx214->hblank->flags |=3D V4L2_CTRL_FLAG_READ_ONLY; + + exposure_max =3D mode->vts_def - IMX214_EXPOSURE_OFFSET; + exposure_def =3D min(exposure_max, IMX214_EXPOSURE_DEFAULT); imx214->exposure =3D v4l2_ctrl_new_std(ctrl_hdlr, &imx214_ctrl_ops, V4L2_CID_EXPOSURE, - IMX214_EXPOSURE_MIN, - IMX214_EXPOSURE_MAX, + IMX214_EXPOSURE_MIN, exposure_max, IMX214_EXPOSURE_STEP, - IMX214_EXPOSURE_DEFAULT); + exposure_def); =20 imx214->unit_size =3D v4l2_ctrl_new_std_compound(ctrl_hdlr, NULL, @@ -879,6 +948,12 @@ static int imx214_get_frame_interval(struct v4l2_subde= v *subdev, return 0; } =20 +/* + * Raw sensors should be using the VBLANK and HBLANK controls to determine + * the frame rate. However this driver was initially added using the + * [S|G|ENUM]_FRAME_INTERVAL ioctls with a fixed rate of 30fps. + * Retain the frame_interval ops for backwards compatibility, but they do = nothing. + */ static int imx214_enum_frame_interval(struct v4l2_subdev *subdev, struct v4l2_subdev_state *sd_state, struct v4l2_subdev_frame_interval_enum *fie) --=20 2.47.0