From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.19]) (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 C4F4E3C7DFC for ; Wed, 25 Mar 2026 10:58:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.19 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774436329; cv=none; b=J2DSCjW1BReDw/3gvvC8TcjWEIvjiDtgco5v01xGjGZGp1H0KA1M8fGsYc1v8gXYRpiFoVhmkzqSOu31kn3j3tPe9tZHJJC65mo69rdz3gvxMw8SIlEUNjunNk+DahSIqXsxP6y0IW0N//bnYh/9B3VENqVv5nXY+nfIxRFUD+U= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774436329; c=relaxed/simple; bh=pYFozUXBhOHY2SCGb7DsIAqay6Mv9Li+qN0aPfoeNO8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ioMWfPLiOvdvgonQNKd57UEraSvNZqPwjWqSM20HgiAxd271Y89CxqSOJp+gsvW3urcXYPxokPPzaP1KhubVDarWHeprf0rBoIbuXYTJ5RtJuwEMq+FaFxy9eeI71wLnLmoMNHVkhiECUi7H8T5w1MCT70pcBY2WsE7WljJP4uM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=pass smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=G0LAIbiA; arc=none smtp.client-ip=192.198.163.19 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="G0LAIbiA" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1774436328; x=1805972328; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=pYFozUXBhOHY2SCGb7DsIAqay6Mv9Li+qN0aPfoeNO8=; b=G0LAIbiA85CIJ9Q2ksGF/beK/4u46K0nCDHaEhxkK5eQKM4bhpGIf+3S hX7wYK5lYrfGkFfJ6rHfqJFRWkzRS0zdTtIDxua6LjN29udaoC9mCXhjN IG0nnjhEsxXaond3Ebnqc8Ex37SWBTS9I25WN1HguLTmSyuur7Yv2eFdC 5JRxQUvicfyEIufkYmzSRrOeqarNvaQhu0OdpI5q2mv+6Ei0nD71HsWGU GYVOhoKqMbEx4pAU4ElKbvvndstvsLCwBA6IajFGHI6OSFVQVgkd2z3UX rS+LpXPUsWrSO4NJkG1iGwuHT/Wo0votcwQWszS/EtnHrH+ED5S4xNui6 w==; X-CSE-ConnectionGUID: 3dYluT+bT4qBGv5+nalX3Q== X-CSE-MsgGUID: d5civoHyTCyV7Z4f2XB1ew== X-IronPort-AV: E=McAfee;i="6800,10657,11739"; a="74496399" X-IronPort-AV: E=Sophos;i="6.23,140,1770624000"; d="scan'208";a="74496399" Received: from fmviesa008.fm.intel.com ([10.60.135.148]) by fmvoesa113.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Mar 2026 03:58:42 -0700 X-CSE-ConnectionGUID: W1bja8SLRmWrsWuaX5FW9w== X-CSE-MsgGUID: 9L6ZaL8EQ9qo7EVpjymNpg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.23,140,1770624000"; d="scan'208";a="221763493" Received: from dalessan-mobl3.ger.corp.intel.com (HELO kekkonen.fi.intel.com) ([10.245.245.64]) by fmviesa008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Mar 2026 03:58:35 -0700 Received: from punajuuri.localdomain (unknown [192.168.240.130]) by kekkonen.fi.intel.com (Postfix) with ESMTP id 813C5121D4F; Wed, 25 Mar 2026 12:58:30 +0200 (EET) Received: from sailus by punajuuri.localdomain with local (Exim 4.98.2) (envelope-from ) id 1w5LwI-00000004wA7-416g; Wed, 25 Mar 2026 12:58:18 +0200 Organization: Intel Finland Oy - BIC 0357606-4 - c/o Alberga Business Park, 6 krs, Bertel Jungin Aukio 5, 02600 Espoo From: Sakari Ailus To: linux-media@vger.kernel.org Cc: hans@jjverkuil.nl, laurent.pinchart@ideasonboard.com, Prabhakar , Kate Hsuan , Dave Stevenson , Tommaso Merciai , Benjamin Mugnier , Sylvain Petinot , Christophe JAILLET , Julien Massot , Naushir Patuck , "Yan, Dongcheng" , "Cao, Bingbu" , "Qiu, Tian Shu" , Stefan Klug , Mirela Rabulea , =?UTF-8?q?Andr=C3=A9=20Apitzsch?= , Heimir Thor Sverrisson , Kieran Bingham , Mehdi Djait , Ricardo Ribalda Delgado , Hans de Goede , Jacopo Mondi , Tomi Valkeinen , David Plowman , "Yu, Ong Hock" , "Ng, Khai Wen" , Jai Luthra Subject: [PATCH v3 05/22] media: imx219: Fix vertical blanking and exposure for analogue binning Date: Wed, 25 Mar 2026 12:58:01 +0200 Message-ID: <20260325105818.1176816-6-sakari.ailus@linux.intel.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260325105818.1176816-1-sakari.ailus@linux.intel.com> References: <20260325105818.1176816-1-sakari.ailus@linux.intel.com> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit When vertical analogue binning is in use, the minimum frame length in lines decreases to around half of the normal. In relation to the sensor's output size this means vertical blanking can be negative but that's not an issue as control values are signed. Remove the workaround for this non-issue that doubled the pixel rate, frame length in lines and exposure time. The resulting change also fixes the minimum, the maximum and the step values for the control. Fixes: f513997119f4 ("media: i2c: imx219: Scale the pixel rate for analog binning") Signed-off-by: Sakari Ailus --- drivers/media/i2c/imx219.c | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/drivers/media/i2c/imx219.c b/drivers/media/i2c/imx219.c index 6819a2fa3262..a72630ad1561 100644 --- a/drivers/media/i2c/imx219.c +++ b/drivers/media/i2c/imx219.c @@ -420,15 +420,6 @@ static void imx219_get_binning(struct v4l2_subdev_state *state, u8 *bin_h, } -static inline u32 imx219_get_rate_factor(struct v4l2_subdev_state *state) -{ - u8 bin_h, bin_v; - - imx219_get_binning(state, &bin_h, &bin_v); - - return (bin_h & bin_v) == IMX219_BINNING_X2_ANALOG ? 2 : 1; -} - /* ----------------------------------------------------------------------------- * Controls */ @@ -440,12 +431,10 @@ 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; - u32 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(state); if (ctrl->id == V4L2_CID_VBLANK) { int exposure_max, exposure_def; @@ -478,7 +467,7 @@ static int imx219_set_ctrl(struct v4l2_ctrl *ctrl) break; case V4L2_CID_EXPOSURE: cci_write(imx219->regmap, IMX219_REG_EXPOSURE, - ctrl->val / rate_factor, &ret); + ctrl->val, &ret); break; case V4L2_CID_DIGITAL_GAIN: cci_write(imx219->regmap, IMX219_REG_DIGITAL_GAIN, @@ -495,7 +484,7 @@ static int imx219_set_ctrl(struct v4l2_ctrl *ctrl) break; case V4L2_CID_VBLANK: cci_write(imx219->regmap, IMX219_REG_FRM_LENGTH_A, - (format->height + ctrl->val) / rate_factor, &ret); + format->height + ctrl->val, &ret); break; case V4L2_CID_HBLANK: cci_write(imx219->regmap, IMX219_REG_LINE_LENGTH_A, @@ -878,7 +867,6 @@ static int imx219_set_pad_format(struct v4l2_subdev *sd, crop->top = (IMX219_NATIVE_HEIGHT - crop->height) / 2; if (fmt->which == V4L2_SUBDEV_FORMAT_ACTIVE) { - unsigned int rate_factor = imx219_get_rate_factor(state); int exposure_max; int exposure_def; int llp_min; @@ -886,15 +874,16 @@ static int imx219_set_pad_format(struct v4l2_subdev *sd, /* Update limits and set FPS to default */ ret = __v4l2_ctrl_modify_range(imx219->vblank, - IMX219_VBLANK_MIN * rate_factor, - (IMX219_FLL_MAX - mode->height) * - rate_factor, rate_factor, - mode->fll_def - mode->height); + (int)(mode->height / binning), + IMX219_FLL_MAX - mode->height, 1, + (int)(mode->fll_def / binning) - + (int)mode->height); if (ret) return ret; ret = __v4l2_ctrl_s_ctrl(imx219->vblank, - mode->fll_def - mode->height); + (int)(mode->fll_def / binning) - + (int)mode->height); if (ret) return ret; @@ -931,7 +920,7 @@ static int imx219_set_pad_format(struct v4l2_subdev *sd, return ret; /* Scale the pixel rate based on the mode specific factor */ - pixel_rate = imx219_get_pixel_rate(imx219) * rate_factor; + pixel_rate = imx219_get_pixel_rate(imx219); ret = __v4l2_ctrl_modify_range(imx219->pixel_rate, pixel_rate, pixel_rate, 1, pixel_rate); if (ret) -- 2.47.3