Received: by 2002:ab2:7903:0:b0:1fb:b500:807b with SMTP id a3csp625714lqj; Sun, 2 Jun 2024 14:31:54 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCVEblEIXNEMgj4RxrNGUB7i01dGG3AstPlo3bqufdwaswN+N6cfD4+w1NZj4MQyzbA93MaMxo85olyg/FxPuIbZIpX/Le4EZJK8cSK3Wg== X-Google-Smtp-Source: AGHT+IFXwF1gfICNeT8w0QVjDQBzB4bRqJModohF+QtqM35emy/xd7SYh1hl0L9gBLml6/PRCe4h X-Received: by 2002:a17:903:2448:b0:1f6:74e6:1ec1 with SMTP id d9443c01a7336-1f674e62022mr18999565ad.68.1717363913787; Sun, 02 Jun 2024 14:31:53 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1717363913; cv=pass; d=google.com; s=arc-20160816; b=M+zZ+VxRcH2uz06QR9D1s3fyuJXxmNT4E4hot0GMY2MbgLpka+McndDd9tPmTEJLeC CayCCO4e+PplidFkELaHHYWY6WBwxX3f3LbYwbuyJEKvpoHrde0GvRw4fp5dB9Ta5R3j N8uQ7DuXCr5YuwHSaRk4C/JFoHbFb+eTs3dVCBxLcf4og8Q5H3zUXhEHL1dR74MxMURc n3r5cKoKm51oQWoISKmAo9OG56v4BON8PXXUOuKBk0zSXHHNOynW0tENsBgZwBBRfMmC RZrIUlD0V67xNu6/O52a0R12w7VtQBElCy99kOIK9+RAziOBIOWYK8j4Kg9ryDV4dO7L Tc9Q== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=TqJSDNIcYAg5c5AK2hjAXrI8p2YMYTt9oVpXL5nQoOw=; fh=ng0FUFwPgHHqIHtWcUlLUSBs0e7fHIUGeuUhfcQSRgA=; b=J4dN5I8e5SyAqaJ6SepQ+FNrlNtoHt36tQOC3eEOqMiFgBCodVsnGPCq9IqMWrgRC4 T6mUD8LQzw7ktL1BoA0+WIlltyf4f3pj1QcoSk0kqfq+eMtUNWHJhIOM4EgPu9BWg1a2 Y761SITcwko274eKFinbEapVSu5XkE6QINmmLRfKEkT5LIGeH4m2zmfgtKsuzEtz4Evb NlgvceTM0NFrY3LFskZOfFZdwXTjS0MtQNMgRUFaoz+CJuMaq2+fbTZgZSn85qns6xyP 2OCoIPgL+OfjA+P7mX254lWNe93KO+iZV4GkUxpwz8yrIxwa9+4DqZJghNkew4AgBcIe RIpg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=fail header.i=@luigi311.com header.s=x header.b=xkgKuGss; arc=pass (i=1 spf=pass spfdomain=luigi311.com dkim=pass dkdomain=luigi311.com); spf=pass (google.com: domain of linux-kernel+bounces-198414-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-198414-linux.lists.archive=gmail.com@vger.kernel.org" Return-Path: Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [147.75.48.161]) by mx.google.com with ESMTPS id d9443c01a7336-1f632406c34si52932815ad.503.2024.06.02.14.31.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Jun 2024 14:31:53 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-198414-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161; Authentication-Results: mx.google.com; dkim=fail header.i=@luigi311.com header.s=x header.b=xkgKuGss; arc=pass (i=1 spf=pass spfdomain=luigi311.com dkim=pass dkdomain=luigi311.com); spf=pass (google.com: domain of linux-kernel+bounces-198414-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-198414-linux.lists.archive=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id 04F4AB22D74 for ; Sun, 2 Jun 2024 20:22:36 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 70DC17E796; Sun, 2 Jun 2024 20:20:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=luigi311.com header.i=@luigi311.com header.b="xkgKuGss" Received: from mail-108-mta38.mxroute.com (mail-108-mta38.mxroute.com [136.175.108.38]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 31D5077115 for ; Sun, 2 Jun 2024 20:20:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=136.175.108.38 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717359610; cv=none; b=HhdzadyN0djYxyRz2w/+uEwkBDUtUuaPoF1oEvE6PF0SeebALrP7aVVNTctnLzLN1+6+edXA1d1Ii+dJ0D8I6GfsXQusZW24GpK7W6A4yrJqgEYx7fzIgx09ijgJXpoKmCwdtpJJe3bVjE+U7lrjOV4qweXYCgoPxGKockFp4No= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717359610; c=relaxed/simple; bh=4KQV0NHOt7hQp4p/mm19QOVdO1e0l84pdOZTBhUWfug=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tok3hmL5drNWzZ0rmM4FVJhpF+e8H9oAyktwpped2Q3TwbuEl905ETwLBbGm3MXf3zLj8f8/wkzWtXyNQ78Zolmp1QKiybUNSF1yU6l7XBuMvWYko72gylpVnDWBt777yNpqAn8+bTsV44xhKExSXlOvAT2u5IQ6731fsHDFp0Q= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=luigi311.com; spf=pass smtp.mailfrom=luigi311.com; dkim=pass (2048-bit key) header.d=luigi311.com header.i=@luigi311.com header.b=xkgKuGss; arc=none smtp.client-ip=136.175.108.38 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=luigi311.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=luigi311.com Received: from filter006.mxroute.com ([136.175.111.3] filter006.mxroute.com) (Authenticated sender: mN4UYu2MZsgR) by mail-108-mta38.mxroute.com (ZoneMTA) with ESMTPSA id 18fda969ba4000e2b6.010 for (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384); Sun, 02 Jun 2024 20:14:14 +0000 X-Zone-Loop: 78cbb4e425cfb09ff416c20f927fd70a96b408fd3041 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=luigi311.com; s=x; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=TqJSDNIcYAg5c5AK2hjAXrI8p2YMYTt9oVpXL5nQoOw=; b=xkgKuGssvjmEjYFsHQgKFfPt+r 0gHdCvI7vYBddu5d/KikRq9TMzb2iZl0Hw4n3d9yGBd6rhgG/DndD68oQRxgFKgRhT2ka7h/fK6er nPGPE8H8KksGMUUsSSKQZ4cXtLcbDf5xHpl6GkocyUbtxkOWthodNS6Htk6eiYhsoo2miHX/QEz2Q D8HWs4SUwXZptqZWTBQT0aZ4uYThdLO8dDQkPo/ao5fM4NNN9dYsISU7KRpNL0TkK2V6FJCQ9aZAt o99HRUULskKCM/dQAiMnnp9beTUd9efq67IQYiArH8c8y3bOnLOAUkhSC/aTwesDcL0MEI/B06x7r Y9DXG7tA==; From: git@luigi311.com To: linux-media@vger.kernel.org Cc: dave.stevenson@raspberrypi.com, jacopo.mondi@ideasonboard.com, mchehab@kernel.org, robh@kernel.org, krzysztof.kozlowski+dt@linaro.org, conor+dt@kernel.org, shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, sakari.ailus@linux.intel.com, devicetree@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, pavel@ucw.cz, phone-devel@vger.kernel.org, Luis Garcia Subject: [PATCH v6 10/23] media: i2c: imx258: Follow normal V4L2 behaviours for clipping exposure Date: Sun, 2 Jun 2024 14:13:32 -0600 Message-ID: <20240602201345.328737-11-git@luigi311.com> In-Reply-To: <20240602201345.328737-1-git@luigi311.com> References: <20240602201345.328737-1-git@luigi311.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Authenticated-Id: personal@luigi311.com From: Dave Stevenson V4L2 sensor drivers are expected to clip the supported exposure range based on the VBLANK configured. IMX258 wasn't doing that as register 0x350 (FRM_LENGTH_CTL) switches it to a mode where frame length tracks coarse exposure time. Disable this mode and clip the range for V4L2_CID_EXPOSURE appropriately based on V4L2_CID_VBLANK. Signed-off-by: Dave Stevenson Reviewed-by: Jacopo Mondi Signed-off-by: Luis Garcia --- drivers/media/i2c/imx258.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/drivers/media/i2c/imx258.c b/drivers/media/i2c/imx258.c index 8f792f0e0738..ebc404b548b3 100644 --- a/drivers/media/i2c/imx258.c +++ b/drivers/media/i2c/imx258.c @@ -37,10 +37,11 @@ /* Exposure control */ #define IMX258_REG_EXPOSURE 0x0202 +#define IMX258_EXPOSURE_OFFSET 10 #define IMX258_EXPOSURE_MIN 4 #define IMX258_EXPOSURE_STEP 1 #define IMX258_EXPOSURE_DEFAULT 0x640 -#define IMX258_EXPOSURE_MAX 65535 +#define IMX258_EXPOSURE_MAX (IMX258_VTS_MAX - IMX258_EXPOSURE_OFFSET) /* Analog gain control */ #define IMX258_REG_ANALOG_GAIN 0x0204 @@ -371,7 +372,7 @@ static const struct imx258_reg mode_common_regs[] = { { 0x303A, 0x00 }, { 0x303B, 0x10 }, { 0x300D, 0x00 }, - { 0x0350, 0x01 }, + { 0x0350, 0x00 }, { 0x0204, 0x00 }, { 0x0205, 0x00 }, { 0x020E, 0x01 }, @@ -734,6 +735,19 @@ static int imx258_update_digital_gain(struct imx258 *imx258, u32 len, u32 val) return 0; } +static void imx258_adjust_exposure_range(struct imx258 *imx258) +{ + int exposure_max, exposure_def; + + /* Honour the VBLANK limits when setting exposure. */ + exposure_max = imx258->cur_mode->height + imx258->vblank->val - + IMX258_EXPOSURE_OFFSET; + exposure_def = min(exposure_max, imx258->exposure->val); + __v4l2_ctrl_modify_range(imx258->exposure, imx258->exposure->minimum, + exposure_max, imx258->exposure->step, + exposure_def); +} + static int imx258_set_ctrl(struct v4l2_ctrl *ctrl) { struct imx258 *imx258 = @@ -741,6 +755,13 @@ static int imx258_set_ctrl(struct v4l2_ctrl *ctrl) struct i2c_client *client = v4l2_get_subdevdata(&imx258->sd); int ret = 0; + /* + * The VBLANK control may change the limits of usable exposure, so check + * and adjust if necessary. + */ + if (ctrl->id == V4L2_CID_VBLANK) + imx258_adjust_exposure_range(imx258); + /* * Applying V4L2 control value only happens * when power is up for streaming -- 2.44.0