From patchwork Mon Nov 25 15:06:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jai Luthra X-Patchwork-Id: 845472 Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) (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 0213D18F2F8; Mon, 25 Nov 2024 15:07:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=213.167.242.64 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732547236; cv=none; b=mqO38ay4CoXn6E5VD8aogzVDjU+IE63WSAldXpnq62Ku4SL9F9ktD4orVuMkbDuQDxANsnjrjKD6BTVb8r2mAGOSg8TmkyrtnXGQj8QIvUJjjgsI2YGNVTj2h3hexy0dZeWq9nDtz8cfHQgIvvnzs2Z1OIlBplih3DdBWZze3wg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732547236; c=relaxed/simple; bh=7nO4W9FHrQF7HTXU3oQaITzCXQYnWKNMt/Ie0tsFwP4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=m9pdSZovj3ybgiWdAFmU8eEC11b41yVWEIGWV2zHq4R1uVdxCwsMShlI3xWjjvVfKfdk2qfHp/Z0YDAtMDENaymJq9gj25EcSYSuX3rY4r2uB8Y9trtum9dmZKi7jedAFF1N4QVSKCS3qhSgdUx/6HPfvOGZxsg8U/fuTiSlw7I= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ideasonboard.com; spf=pass smtp.mailfrom=ideasonboard.com; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b=hcKT6oZf; arc=none smtp.client-ip=213.167.242.64 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ideasonboard.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ideasonboard.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="hcKT6oZf" Received: from mail.ideasonboard.com (unknown [IPv6:2401:4900:883a:fbdb:56c3:2e5a:271e:2a92]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 1C654E1F; Mon, 25 Nov 2024 16:06:50 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1732547211; bh=7nO4W9FHrQF7HTXU3oQaITzCXQYnWKNMt/Ie0tsFwP4=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=hcKT6oZfDBwuxW55fjNY/lM4j1PgNj/CUlptfgHOsT7LQZ6inBxTeABhFlGS6T01C VDRsliJ7sOHjmUgqd9YwGr9jZUFpF83B2MWGCxsBGTu/XGk/RBVXp/4e1jaDdIKT97 TEtn3ZZ6Z6QYpfB/taSz/mWCmnMSxr3rzHzXII6o= From: Jai Luthra Date: Mon, 25 Nov 2024 20:36:25 +0530 Subject: [PATCH v3 1/3] media: i2c: imx219: Correct the minimum vblanking value Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241125-imx219_fixes-v3-1-434fc0b541c8@ideasonboard.com> References: <20241125-imx219_fixes-v3-0-434fc0b541c8@ideasonboard.com> In-Reply-To: <20241125-imx219_fixes-v3-0-434fc0b541c8@ideasonboard.com> To: Dave Stevenson , Sakari Ailus , Mauro Carvalho Chehab Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Jacopo Mondi , Laurent Pinchart , Jai Luthra , David Plowman X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1008; i=jai.luthra@ideasonboard.com; h=from:subject:message-id; bh=FxHt38p3XhnjMDjbzpb+rHs2MXzI2leVKatnUpUMCq4=; b=owEBbQKS/ZANAwAIAUPekfkkmnFFAcsmYgBnRJKTik5TREvNL3BTMU1y5labtDJuY8z5ftlfw j5Aq8BkFROJAjMEAAEIAB0WIQRN4NgY5dV16NRar8VD3pH5JJpxRQUCZ0SSkwAKCRBD3pH5JJpx RccTEACrff5uak9YbKOEjml5zv8dlxarMsYTENXSBhbs7Ec/l7pYIiHKElYR7v8wvP3yxVWUCZC G+VBMIyQ+vYq/yHI/8t19sFsAHDm5NP8NJ5hmWbZOSwGWEhxG6phBF9Rs41n3rxmQSlZ7koG00t IcnL6S3PabLpQu9/IT3FSS+hdWzkTEq5RCJw+5eJ/DcQtVCGKeJ5HjZwccBF3726PQhPlBWso/S M0hZB7qwgMvdKelVPBj7UOOYzDLLDBxHJxPeAiJzITDcHe0e011DXIfg2HDXT25TqdPtXtHcP2b BGC2aEzkBFFR5WpAs5cBWnzxpbkxn6bi07PNWShUfESM3VP/cRSBu/bt5+06idaoGrwmOqSA5oc KHeXMnGw9lQiBp8wvABdb9XLYvWtIjlSkdUGt84P9m19WT453r7REAzJmHDEjawqHe0ZMgh6F9K zF4pwntjJKG8MiWaZWf+rkmIwcu+TP7PPd3yLYTytXzjhF3bEbeal7HC4kaIZl81q5Vy9+CBDe3 iXjPjzjkZRwjgb3xGfrSVUZQLQeZAlpNHUURQZ1xlGwhKtBuoZquK1PBSCOwcesCi/KP9tcR34y apjputShGNjXspLW6xte3Ym11KS/8WOSWiyq3Dg1KhLg5o+LO/1yj9s/CMZsZbjAy3gN0nT14G8 oz7KNyJ7zVEtIJw== X-Developer-Key: i=jai.luthra@ideasonboard.com; a=openpgp; fpr=4DE0D818E5D575E8D45AAFC543DE91F9249A7145 From: David Plowman The datasheet for this sensor documents the minimum vblanking as being 32 lines. It does fix some problems with occasional black lines at the bottom of images (tested on Raspberry Pi). Signed-off-by: David Plowman Reviewed-by: Jacopo Mondi Reviewed-by: Dave Stevenson Signed-off-by: Jai Luthra --- drivers/media/i2c/imx219.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/i2c/imx219.c b/drivers/media/i2c/imx219.c index e78a80b2bb2e455c857390b188c128b28c224778..f98aad74fe584a18e2fe7126f92bf294762a54e3 100644 --- a/drivers/media/i2c/imx219.c +++ b/drivers/media/i2c/imx219.c @@ -74,7 +74,7 @@ #define IMX219_REG_VTS CCI_REG16(0x0160) #define IMX219_VTS_MAX 0xffff -#define IMX219_VBLANK_MIN 4 +#define IMX219_VBLANK_MIN 32 /* HBLANK control - read only */ #define IMX219_PPL_DEFAULT 3448 From patchwork Mon Nov 25 15:06:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jai Luthra X-Patchwork-Id: 845865 Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) (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 D47271B3949; Mon, 25 Nov 2024 15:07:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=213.167.242.64 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732547242; cv=none; b=B/9nqGtbpGnuER4lPui67Mk73Ap0Xqehjz8HTh/CQVf1702L5ow48JzCFMH+C7fmamrfz0cohhpop2q0/pEfIbSc6+iFWW0vAWAbTKQaKzSd+EypgmghgaNwbBpSBlEilcZe89f682ferRt9sMYe9gLAHkcZwVE00YeMk94PDmM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732547242; c=relaxed/simple; bh=FSYYhUiGRYV2D6HVG9VVs0ICSoCkSR10pJa8IEKTvYU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=IcespEbQ8tT4UwHLwkoR3u1cJVCIjN4/sbz3TCMkGcRaNdTqEYuoeRbYK1dl0O2LDy4MRJkLCvB+h5AoDyrFnM4iiy4sYjP4JeKmYOHDYXxVqzK/bN79As0+ZzydDCE/dZ9j8BToOMshWp755uQpNBA0c6doCnyPteIwJX41L2A= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ideasonboard.com; spf=pass smtp.mailfrom=ideasonboard.com; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b=Bu/U8Bbf; arc=none smtp.client-ip=213.167.242.64 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ideasonboard.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ideasonboard.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="Bu/U8Bbf" Received: from mail.ideasonboard.com (unknown [IPv6:2401:4900:883a:fbdb:56c3:2e5a:271e:2a92]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 5869A6B5; Mon, 25 Nov 2024 16:06:57 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1732547217; bh=FSYYhUiGRYV2D6HVG9VVs0ICSoCkSR10pJa8IEKTvYU=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=Bu/U8BbfLUZLLgrFIjDeKTYFWW6e5OuYVRyxJqRtxP0hf9twUGYeSZu31nrZsFped 2rBBtHKrWfTR18eXmJ3EgkchDsbBU6wnaK/mveqU+58ygnP+fZTS1aMYAM2lWbEw5I zTidTOibE2kTdmHfMo8CkH4QMf64L5qnc4HY+Z0Y= From: Jai Luthra Date: Mon, 25 Nov 2024 20:36:26 +0530 Subject: [PATCH v3 2/3] media: i2c: imx219: make HBLANK r/w to allow longer exposures Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241125-imx219_fixes-v3-2-434fc0b541c8@ideasonboard.com> References: <20241125-imx219_fixes-v3-0-434fc0b541c8@ideasonboard.com> In-Reply-To: <20241125-imx219_fixes-v3-0-434fc0b541c8@ideasonboard.com> To: Dave Stevenson , Sakari Ailus , Mauro Carvalho Chehab Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Jacopo Mondi , Laurent Pinchart , Jai Luthra X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=4074; i=jai.luthra@ideasonboard.com; h=from:subject:message-id; bh=/McndCobi0rteU1aA7pbQyLlYRSTH8TmxfP/vtIS8+E=; b=kA0DAAgBQ96R+SSacUUByyZiAGdEkpOhDlirYOOcJ4W4pDIzJfIDYe1KnSZeL+rIIwZTuxMQV YkCMwQAAQgAHRYhBE3g2Bjl1XXo1FqvxUPekfkkmnFFBQJnRJKTAAoJEEPekfkkmnFFhi0P/irV DQk5fadp3KNfUFQrzsBWsrjXVdchRR7imXGNSIGYAxf/XDCblvoFRDFly14oJCd+3ANXxtm2kcX BJGNS0tfjif1CsXp/zqlom3T9NveOGjRtspBgm8Z9uJcUOjytTkOaAA8bie8Pho/iDhfFRYe2gj 9xo2OLUBbKfT1kuMsBi7bx4jJpMsLH61RLqw5UJbTteE+IJMW15wiWuVJLMUR+0ZatiXhZ7fO95 2AA6RTHWoFGkSlLCM66Bz7vxkDbgEsLGcRqCMtzMY2Y7PhhwfwSJGfIOSmxMD/pUG9L5WINT8wI KcMXtLlJNdJr5W1O5pKDnw+uD5KslR0TuKUG1fw+G9+9oe82Pd52bEZKRtfUUtpvpqAZRi5PPC+ z52ELNX9mDlb/xFVDAv06Ykx4FJ/f6NQBLlVhdNTdZh+MlbOu5qkcyyWqr/0QIXa+14UMpTUfpq mSXEBVDsOlS+sPT/QDwubuub+1/JIQfg1hQjTw78AQCN9j4bacTivwmbTLtX3NgKYe4NbNcGAQp 8BdKlktvqiFGkSabP3y8Nz+Eila2+dIiI4zdsrH1uKnfIT42ai0q/hhjM+XPuEy84pQnB1sntxL JFNc/yNcbBYiJVTQi+TPebgvQnoiklPkJ2u0TUEz4XiDN4a7rihPZNvXzcwrp760QS8luD7b6Vt XjSvV X-Developer-Key: i=jai.luthra@ideasonboard.com; a=openpgp; fpr=4DE0D818E5D575E8D45AAFC543DE91F9249A7145 From: Dave Stevenson The HBLANK control was read-only, and always configured such that the sensor HTS register was 3448. This limited the maximum exposure time that could be achieved to around 1.26 secs. Make HBLANK read/write so that the line time can be extended, and thereby allow longer exposures (and slower frame rates). Retain the overall HTS setting when changing modes rather than resetting it to a default. Signed-off-by: Dave Stevenson Reviewed-by: Jacopo Mondi Signed-off-by: Jai Luthra --- drivers/media/i2c/imx219.c | 37 ++++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/drivers/media/i2c/imx219.c b/drivers/media/i2c/imx219.c index f98aad74fe584a18e2fe7126f92bf294762a54e3..970e6362d0ae3a9078daf337155e83d637bc1ca1 100644 --- a/drivers/media/i2c/imx219.c +++ b/drivers/media/i2c/imx219.c @@ -76,8 +76,10 @@ #define IMX219_VBLANK_MIN 32 -/* HBLANK control - read only */ -#define IMX219_PPL_DEFAULT 3448 +/* HBLANK control range */ +#define IMX219_PPL_MIN 0x0d78 +#define IMX219_PPL_MAX 0x7ff0 +#define IMX219_REG_HTS CCI_REG16(0x0162) #define IMX219_REG_LINE_LENGTH_A CCI_REG16(0x0162) #define IMX219_REG_X_ADD_STA_A CCI_REG16(0x0164) @@ -422,6 +424,10 @@ static int imx219_set_ctrl(struct v4l2_ctrl *ctrl) cci_write(imx219->regmap, IMX219_REG_VTS, format->height + ctrl->val, &ret); break; + case V4L2_CID_HBLANK: + cci_write(imx219->regmap, IMX219_REG_HTS, + format->width + ctrl->val, &ret); + break; case V4L2_CID_TEST_PATTERN_RED: cci_write(imx219->regmap, IMX219_REG_TESTP_RED, ctrl->val, &ret); @@ -496,12 +502,10 @@ static int imx219_init_controls(struct imx219 *imx219) V4L2_CID_VBLANK, IMX219_VBLANK_MIN, IMX219_VTS_MAX - mode->height, 1, mode->vts_def - mode->height); - hblank = IMX219_PPL_DEFAULT - mode->width; + hblank = IMX219_PPL_MIN - mode->width; imx219->hblank = v4l2_ctrl_new_std(ctrl_hdlr, &imx219_ctrl_ops, V4L2_CID_HBLANK, hblank, hblank, 1, hblank); - if (imx219->hblank) - imx219->hblank->flags |= V4L2_CTRL_FLAG_READ_ONLY; exposure_max = mode->vts_def - 4; exposure_def = (exposure_max < IMX219_EXPOSURE_DEFAULT) ? exposure_max : IMX219_EXPOSURE_DEFAULT; @@ -817,6 +821,10 @@ static int imx219_set_pad_format(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt *format; struct v4l2_rect *crop; unsigned int bin_h, bin_v; + u32 prev_hts; + + format = v4l2_subdev_state_get_format(state, 0); + prev_hts = format->width + imx219->hblank->val; mode = v4l2_find_nearest_size(supported_modes, ARRAY_SIZE(supported_modes), @@ -824,8 +832,6 @@ static int imx219_set_pad_format(struct v4l2_subdev *sd, fmt->format.width, fmt->format.height); imx219_update_pad_format(imx219, mode, &fmt->format, fmt->format.code); - - format = v4l2_subdev_state_get_format(state, 0); *format = fmt->format; /* @@ -861,13 +867,18 @@ static int imx219_set_pad_format(struct v4l2_subdev *sd, exposure_max, imx219->exposure->step, exposure_def); /* - * Currently PPL is fixed to IMX219_PPL_DEFAULT, so hblank - * depends on mode->width only, and is not changeble in any - * way other than changing the mode. + * Retain PPL setting from previous mode so that the + * line time does not change on a mode change. + * Limits have to be recomputed as the controls define + * the blanking only, so PPL values need to have the + * mode width subtracted. */ - hblank = IMX219_PPL_DEFAULT - mode->width; - __v4l2_ctrl_modify_range(imx219->hblank, hblank, hblank, 1, - hblank); + hblank = prev_hts - mode->width; + __v4l2_ctrl_modify_range(imx219->hblank, + IMX219_PPL_MIN - mode->width, + IMX219_PPL_MAX - mode->width, + 1, IMX219_PPL_MIN - mode->width); + __v4l2_ctrl_s_ctrl(imx219->hblank, hblank); } return 0; From patchwork Mon Nov 25 15:06:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jai Luthra X-Patchwork-Id: 845471 Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) (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 39E2A1B395C; Mon, 25 Nov 2024 15:07:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=213.167.242.64 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732547248; cv=none; b=Vxuamgz/Wc51VCQgR7LVcrrjr3PLSwX4pjiJnk6SuA7myLSlzvvYpGh/SSkDnAz8dnAuETvh7ixKtKFINFckjuvJUWb74Epz9y1nqvGu34eligp9n3lLDVv/d3JJuh3OyrljG9qs+izm20joqNUCKRl6EzJmaExIq5T7z8yjTdE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732547248; c=relaxed/simple; bh=ObNp099S/7voqB0WAWP8tLNv0cQWGdENu8N3L04Q4LY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=BiwCJjIqjCJ/469neD/f2Mr61qsgOoYHiOk6jrZntLf0KgUSZX7Oj+9x0aguG/4G+IWNHUuDLVCy0JNnDWIrPGmVa1EtJ6QBuKKzObAUgB783SgEkV2EniG4+62clTLXb/9zGw+75Y/rEe7Ug6i/R5mDqhySlSaI4agYRTs7kbo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ideasonboard.com; spf=pass smtp.mailfrom=ideasonboard.com; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b=mz3M9hPc; arc=none smtp.client-ip=213.167.242.64 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ideasonboard.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ideasonboard.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="mz3M9hPc" Received: from mail.ideasonboard.com (unknown [IPv6:2401:4900:883a:fbdb:56c3:2e5a:271e:2a92]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id AAC9912E9; Mon, 25 Nov 2024 16:07:03 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1732547224; bh=ObNp099S/7voqB0WAWP8tLNv0cQWGdENu8N3L04Q4LY=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=mz3M9hPczUH5L27gtsS7LL+BmqNUsStt57oGCsAj43PWyiJWXXZuyyCx+FgLDxTev uskyMGGXR5HhwRZto8tMYbksYTKc3y2MeixCNg1JQkr4xQ/hBlY7Ach+mO6OSeQqwK D4f1k4jIh2krno45SnQ6n2Gr/eGSX9E9xkj4Uvp4= From: Jai Luthra Date: Mon, 25 Nov 2024 20:36:27 +0530 Subject: [PATCH v3 3/3] media: i2c: imx219: Scale the pixel rate for analog binning Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241125-imx219_fixes-v3-3-434fc0b541c8@ideasonboard.com> References: <20241125-imx219_fixes-v3-0-434fc0b541c8@ideasonboard.com> In-Reply-To: <20241125-imx219_fixes-v3-0-434fc0b541c8@ideasonboard.com> To: Dave Stevenson , Sakari Ailus , Mauro Carvalho Chehab Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Jacopo Mondi , Laurent Pinchart , Jai Luthra , Naushir Patuck , Vinay Varma X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=7554; i=jai.luthra@ideasonboard.com; h=from:subject:message-id; bh=ObNp099S/7voqB0WAWP8tLNv0cQWGdENu8N3L04Q4LY=; b=owEBbQKS/ZANAwAIAUPekfkkmnFFAcsmYgBnRJKTFRLBkqeXmq42B+w7zuf2QSR9hVD0w0gFQ V40AFMvkLOJAjMEAAEIAB0WIQRN4NgY5dV16NRar8VD3pH5JJpxRQUCZ0SSkwAKCRBD3pH5JJpx RWD1D/0RJIXkWNfhsEgzjU20x9uTKsamYNNqypABIFVhsvhSdmfIsemwdIOJ47XqUQnvMabN5xD pesFfEdXdsoqasjedJXDdPzf/q/IeGCzQrMXsoxz9vhJwgWtivRAuPnY+kX5ixcgzgKV30A/IjW OylrJ6HuEWOppUK8PKSUpS1YGA1SS9dqG3vpecrIAn3aXJiWsAl6b4rqsus7zx5K5hehW/40qhp TbyJ8+jmbl3UhKeT6DhyVoCKHDzL7enYzXh4Z/wbeC05uYCP2Hjtrcn0GUvui2GLSa0v9yCVrce 0/TVOKIejG4Rvl7QF2mwqP6VGaK7h9uIEPa0sdAWvy/vBQUn9hbXRqf1geDgZgd4qsOjxoQAcXO igYclHuc/UL5PaBPy5AYNETi8VQjuWbFR5AjEwOaCGOoobn0jXFuB0ABKoO3LYhCSMAlfvpnXmG bATsSf46bjQm4oBDlX9gHF+/BXDwzjZ3lGv4UcROkSzfl1RgOXRxs1njZUZCLnY7kCdRKJbEMX2 nqSzg5p8F/FwkxIFFPiGL0qDWPIPorjw2xtVU3gYzHLS2qNtVS6tN5oQbfoMHWkiFPjaiu4H/3M MdXKpwhxxI9pK2lbcIRsh5LUNWocykrdnw80CJ29XjjDPhhl+2oBjSORvRHOUFETwb5HJEvxHym HzAoIeVQMvxcYbw== X-Developer-Key: i=jai.luthra@ideasonboard.com; a=openpgp; fpr=4DE0D818E5D575E8D45AAFC543DE91F9249A7145 When the analog binning mode is used for high framerate operation, the pixel rate is effectively doubled. Account for this when setting up the pixel clock rate, and applying the vblank and exposure controls. The previous logic only used analog binning for 8-bit modes, but normal binning limits the framerate on 10-bit 480p [1]. So with this patch we switch to using special binning (with 2x pixel rate) for all formats of 480p mode and 8-bit 1232p. [1]: https://github.com/raspberrypi/linux/issues/5493 Co-developed-by: Naushir Patuck Signed-off-by: Naushir Patuck Co-developed-by: Vinay Varma Signed-off-by: Vinay Varma Signed-off-by: Jai Luthra --- drivers/media/i2c/imx219.c | 120 ++++++++++++++++++++++++++++----------------- 1 file changed, 76 insertions(+), 44 deletions(-) diff --git a/drivers/media/i2c/imx219.c b/drivers/media/i2c/imx219.c index 970e6362d0ae3a9078daf337155e83d637bc1ca1..39b85cdee58318b080c867afd68ca33d14d3eda7 100644 --- a/drivers/media/i2c/imx219.c +++ b/drivers/media/i2c/imx219.c @@ -149,6 +149,12 @@ #define IMX219_PIXEL_ARRAY_WIDTH 3280U #define IMX219_PIXEL_ARRAY_HEIGHT 2464U +enum binning_mode { + BINNING_NONE = IMX219_BINNING_NONE, + BINNING_X2 = IMX219_BINNING_X2, + BINNING_ANALOG_X2 = IMX219_BINNING_X2_ANALOG, +}; + /* Mode : resolution and related config&values */ struct imx219_mode { /* Frame width */ @@ -337,6 +343,10 @@ struct imx219 { /* Two or Four lanes */ u8 lanes; + + /* Binning mode */ + enum binning_mode bin_h; + enum binning_mode bin_v; }; static inline struct imx219 *to_imx219(struct v4l2_subdev *_sd) @@ -362,6 +372,36 @@ static u32 imx219_get_format_code(struct imx219 *imx219, u32 code) return imx219_mbus_formats[i]; } +static u32 imx219_get_format_bpp(const struct v4l2_mbus_framefmt *format) +{ + switch (format->code) { + case MEDIA_BUS_FMT_SRGGB8_1X8: + case MEDIA_BUS_FMT_SGRBG8_1X8: + case MEDIA_BUS_FMT_SGBRG8_1X8: + case MEDIA_BUS_FMT_SBGGR8_1X8: + return 8; + + case MEDIA_BUS_FMT_SRGGB10_1X10: + case MEDIA_BUS_FMT_SGRBG10_1X10: + case MEDIA_BUS_FMT_SGBRG10_1X10: + case MEDIA_BUS_FMT_SBGGR10_1X10: + default: + return 10; + } +} + +static int imx219_get_rate_factor(struct imx219 *imx219) +{ + switch (imx219->bin_v) { + case BINNING_NONE: + case BINNING_X2: + return 1; + case BINNING_ANALOG_X2: + return 2; + } + return -EINVAL; +} + /* ----------------------------------------------------------------------------- * Controls */ @@ -373,10 +413,12 @@ static int imx219_set_ctrl(struct v4l2_ctrl *ctrl) struct i2c_client *client = v4l2_get_subdevdata(&imx219->sd); const struct v4l2_mbus_framefmt *format; struct v4l2_subdev_state *state; + int rate_factor; int ret = 0; state = v4l2_subdev_get_locked_active_state(&imx219->sd); format = v4l2_subdev_state_get_format(state, 0); + rate_factor = imx219_get_rate_factor(imx219); if (ctrl->id == V4L2_CID_VBLANK) { int exposure_max, exposure_def; @@ -405,7 +447,7 @@ static int imx219_set_ctrl(struct v4l2_ctrl *ctrl) break; case V4L2_CID_EXPOSURE: cci_write(imx219->regmap, IMX219_REG_EXPOSURE, - ctrl->val, &ret); + ctrl->val / rate_factor, &ret); break; case V4L2_CID_DIGITAL_GAIN: cci_write(imx219->regmap, IMX219_REG_DIGITAL_GAIN, @@ -422,7 +464,7 @@ static int imx219_set_ctrl(struct v4l2_ctrl *ctrl) break; case V4L2_CID_VBLANK: cci_write(imx219->regmap, IMX219_REG_VTS, - format->height + ctrl->val, &ret); + (format->height + ctrl->val) / rate_factor, &ret); break; case V4L2_CID_HBLANK: cci_write(imx219->regmap, IMX219_REG_HTS, @@ -463,7 +505,8 @@ static const struct v4l2_ctrl_ops imx219_ctrl_ops = { static unsigned long imx219_get_pixel_rate(struct imx219 *imx219) { - return (imx219->lanes == 2) ? IMX219_PIXEL_RATE : IMX219_PIXEL_RATE_4LANE; + return ((imx219->lanes == 2) ? IMX219_PIXEL_RATE : + IMX219_PIXEL_RATE_4LANE) * imx219_get_rate_factor(imx219); } /* Initialize control handlers */ @@ -592,29 +635,12 @@ static int imx219_set_framefmt(struct imx219 *imx219, { const struct v4l2_mbus_framefmt *format; const struct v4l2_rect *crop; - unsigned int bpp; - u64 bin_h, bin_v; + u32 bpp; int ret = 0; format = v4l2_subdev_state_get_format(state, 0); crop = v4l2_subdev_state_get_crop(state, 0); - - switch (format->code) { - case MEDIA_BUS_FMT_SRGGB8_1X8: - case MEDIA_BUS_FMT_SGRBG8_1X8: - case MEDIA_BUS_FMT_SGBRG8_1X8: - case MEDIA_BUS_FMT_SBGGR8_1X8: - bpp = 8; - break; - - case MEDIA_BUS_FMT_SRGGB10_1X10: - case MEDIA_BUS_FMT_SGRBG10_1X10: - case MEDIA_BUS_FMT_SGBRG10_1X10: - case MEDIA_BUS_FMT_SBGGR10_1X10: - default: - bpp = 10; - break; - } + bpp = imx219_get_format_bpp(format); cci_write(imx219->regmap, IMX219_REG_X_ADD_STA_A, crop->left - IMX219_PIXEL_ARRAY_LEFT, &ret); @@ -625,28 +651,8 @@ static int imx219_set_framefmt(struct imx219 *imx219, cci_write(imx219->regmap, IMX219_REG_Y_ADD_END_A, crop->top - IMX219_PIXEL_ARRAY_TOP + crop->height - 1, &ret); - switch (crop->width / format->width) { - case 1: - default: - bin_h = IMX219_BINNING_NONE; - break; - case 2: - bin_h = bpp == 8 ? IMX219_BINNING_X2_ANALOG : IMX219_BINNING_X2; - break; - } - - switch (crop->height / format->height) { - case 1: - default: - bin_v = IMX219_BINNING_NONE; - break; - case 2: - bin_v = bpp == 8 ? IMX219_BINNING_X2_ANALOG : IMX219_BINNING_X2; - break; - } - - cci_write(imx219->regmap, IMX219_REG_BINNING_MODE_H, bin_h, &ret); - cci_write(imx219->regmap, IMX219_REG_BINNING_MODE_V, bin_v, &ret); + cci_write(imx219->regmap, IMX219_REG_BINNING_MODE_H, imx219->bin_h, &ret); + cci_write(imx219->regmap, IMX219_REG_BINNING_MODE_V, imx219->bin_v, &ret); cci_write(imx219->regmap, IMX219_REG_X_OUTPUT_SIZE, format->width, &ret); @@ -851,6 +857,27 @@ static int imx219_set_pad_format(struct v4l2_subdev *sd, int exposure_max; int exposure_def; int hblank; + int pixel_rate; + u32 bpp = imx219_get_format_bpp(format); + enum binning_mode binning = BINNING_NONE; + + /* + * For 8-bit formats, analog horizontal binning is required, + * else the output image is garbage. + * For 10-bit formats, analog horizontal binning is optional, + * but still useful as it doubles the effective framerate. + * We can only use it with width <= 1624, as for higher values + * there are blocky artefacts. + * + * Vertical binning should match the horizontal binning mode. + */ + if (bin_h == 2 && (format->width <= 1624 || bpp == 8)) + binning = BINNING_ANALOG_X2; + else + binning = BINNING_X2; + + imx219->bin_h = (bin_h == 2) ? binning : BINNING_NONE; + imx219->bin_v = (bin_v == 2) ? binning : BINNING_NONE; /* Update limits and set FPS to default */ __v4l2_ctrl_modify_range(imx219->vblank, IMX219_VBLANK_MIN, @@ -879,6 +906,11 @@ static int imx219_set_pad_format(struct v4l2_subdev *sd, IMX219_PPL_MAX - mode->width, 1, IMX219_PPL_MIN - mode->width); __v4l2_ctrl_s_ctrl(imx219->hblank, hblank); + + /* Scale the pixel rate based on the mode specific factor */ + pixel_rate = imx219_get_pixel_rate(imx219); + __v4l2_ctrl_modify_range(imx219->pixel_rate, pixel_rate, + pixel_rate, 1, pixel_rate); } return 0;