From patchwork Mon May 6 22:38:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 795100 Received: from mail-ej1-f68.google.com (mail-ej1-f68.google.com [209.85.218.68]) (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 A9AE438DE9 for ; Mon, 6 May 2024 22:38:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.68 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715035111; cv=none; b=MXvKO1zC7l8Zvmj1PsLmw6OKAG3KEdnOWrvG+W8kdyJDD3apq5tGrUCVPwPDLvOHBn63IIsLIOMmYPPOyYYIzyP+b2bYMOPR/Qqz1Jh6A8mFJ6rgOy6V6boleE6GLAeQhE8dZI5txtxkkBX7/73sBaPEpRUs9NwXVpAH4d6Tx44= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715035111; c=relaxed/simple; bh=x6iZsTaXUAWHv5Yc0/wKoYsMpmLoZ0ewfrbGSYTHXTE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To:Cc; b=AjAHzzDhLcsMXm4vfxTSfZuCKOkomQozEEGNnoKZV/8ZwK0cDY9h+VWxi5FvbsfSN2UXKumruEtZNxCsJhgjkeAjqzd/9QVAGR9B/MRw8gCSXNaAyom6Yuvl7pqBUn+WTx1aw3GoAzDKJ8q6QUxF5aUkZ06ctUqXUnFB/aCrpDU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=G4EaaeJR; arc=none smtp.client-ip=209.85.218.68 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="G4EaaeJR" Received: by mail-ej1-f68.google.com with SMTP id a640c23a62f3a-a59e4136010so126817766b.3 for ; Mon, 06 May 2024 15:38:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1715035108; x=1715639908; darn=vger.kernel.org; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=PQ6YOnYyqSrD4O0njh6d9wC2eB8fg7WZdjq/cUZ4FVE=; b=G4EaaeJRhY6lrkDkAPOJ5AHOYwNQu7reSwUoIZeoc/Sc+bBX4JGrXUQktmbF7uoLQq 4OonirepKkWdXMT6ffg2MIBOvm4LK7PfMenhir1dwlYbp3EsnhXbeMu2cdd4xGNiZA3F 9B/kNOgVJdIawdt37jo+MTsE7hkykd12YYDhwTPs2EZK+nVd9mzPJFYciLl+IG1NVVWg skkzc14agJqI6lDMp/M4o6NLC/xGSCjZdSxke8SwZkRUHut5ps8kikW1MvOnwLvljea1 TyVVYOFO4neQd2Xz072LNzYz+vL0PLNdsZaHls0SvqvAKkF3HTS9Ebp5qzrl/wezh83g dk4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715035108; x=1715639908; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=PQ6YOnYyqSrD4O0njh6d9wC2eB8fg7WZdjq/cUZ4FVE=; b=p+Pu0HTgGH0pqwg2B8HtZMHthYmNw+Y5s5srJSnEuOzjPizea26BGC26Djms817UGE CD9HtV88s2rMOt/xbrhhjy4bfjzWLEIUAwqkTPqo3DzBnbb/gToyyiFiYlmxMts+WAY/ cZGpQ8bhd1FBCMHvGikOwyw+Za3MR/TtWwdkXaoMELUbj+eKUwYH+bsRc/eE28aYFqF1 SDeVzb0WxhhW0W9rMZvwdewZwzeIc3lRKQBceZ/3UKL/DpZYIxGURH5AK73INhwrovxN 5m2HO8RQOtfd8UCb9U7oYauhDpoFPlxZ8lFFE8Xz4/VHE7i7GqCwhVz8y0GO+tb6aEdW qJig== X-Forwarded-Encrypted: i=1; AJvYcCXezwOWG+01IG8OIz2O6jQQsV9FO94hlf0u1DKLa9DqPyj6hKYYy5d9k+w/VvNwyXZEGngHpceDPGMfSXeAbrns6CPcDLqOaZNijMI= X-Gm-Message-State: AOJu0YysRNT45SxpXkQa5q1FpUDilkMxQrrY3ouOygFKI3yTsAO2S0uq VdYIneVwUTJ0ga2+ypGUoeSoq7F5e2Yki8Z9XeBwEATUg2MfkLO7TdZ/CZgsYvNRWSiNl9kDpT3 T5ANKOBFB X-Google-Smtp-Source: AGHT+IHYpdWaailbj4mKDZiQZUauPEmoTqEasrMPXQE8mPtipsq5LHOkDshEBzhu4iXqZcYxUq53Ew== X-Received: by 2002:a17:907:720a:b0:a59:c963:830 with SMTP id dr10-20020a170907720a00b00a59c9630830mr3884880ejc.58.1715035108033; Mon, 06 May 2024 15:38:28 -0700 (PDT) Received: from [127.0.0.1] ([176.61.106.227]) by smtp.gmail.com with ESMTPSA id bo15-20020a170906d04f00b00a59b87dd0bbsm2810081ejb.161.2024.05.06.15.38.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 May 2024 15:38:27 -0700 (PDT) From: Bryan O'Donoghue Date: Mon, 06 May 2024 23:38:26 +0100 Subject: [PATCH v2] media: i2c: Fix imx412 exposure control Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240506-b4-linux-next-camss-x13s-mmsol-integration-in-test-imx577-fix-v2-1-2e665f072f8f@linaro.org> X-B4-Tracking: v=1; b=H4sIAOFbOWYC/62OQQ6CMBBFr0K6dkxbCqgr72FYFBxgEmhNp5Iaw t2tnMHdf3/x398EYyBkcSs2EXAlJu8y6FMh+sm6EYGemYWW2shK1tAZmMm9EzhMEXq7MENSJcO ysJ+BXMQx2JhncoaIHIGWVDUNDJRgUANiLRtZGyWy4xUw14f/0WaeiKMPn+POqn7tv8yrAgWmK +3V6Lp74uWex2zwZx9G0e77/gUE6Bg5CwEAAA== To: Sakari Ailus , Mauro Carvalho Chehab , "Paul J. Murphy" , Martina Krasteva , Daniele Alessandrelli Cc: Mauro Carvalho Chehab , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Bryan O'Donoghue X-Mailer: b4 0.13-dev-26615 Currently we have the following algorithm to calculate what value should be written to the exposure control of imx412. lpfr = imx412->vblank + imx412->cur_mode->height; shutter = lpfr - exposure; The 'shutter' value is given to IMX412_REG_EXPOSURE_CIT however, the above algorithm will result in the value given to IMX412_REG_EXPOSURE_CIT decreasing as the requested exposure value from user-space goes up. e.g. [ 2255.713989] imx412 20-001a: Received exp 1608, analog gain 0 [ 2255.714002] imx412 20-001a: Set exp 1608, analog gain 0, shutter 1938, lpfr 3546 [ 2256.302770] imx412 20-001a: Received exp 2586, analog gain 100 [ 2256.302800] imx412 20-001a: Set exp 2586, analog gain 100, shutter 960, lpfr 3546 [ 2256.753755] imx412 20-001a: Received exp 3524, analog gain 110 [ 2256.753772] imx412 20-001a: Set exp 3524, analog gain 110, shutter 22, lpfr 3546 This behaviour results in the image having less exposure as the requested exposure value from user-space increases. Other sensor drivers such as ov5675, imx218, hid556 and others take the requested exposure value and directly. Take the example of the above cited sensor drivers and directly apply the requested exposure value from user-space. The 'lpfr' variable still functions as before but the 'shutter' variable can be dispensed with as a result. Once done a similar run of the test application requesting higher exposure looks like this, with 'exp' written directly to the sensor. [ 133.207884] imx412 20-001a: Received exp 1608, analog gain 0 [ 133.207899] imx412 20-001a: Set exp 1608, analog gain 0, lpfr 3546 [ 133.905309] imx412 20-001a: Received exp 2844, analog gain 100 [ 133.905344] imx412 20-001a: Set exp 2844, analog gain 100, lpfr 3546 [ 134.241705] imx412 20-001a: Received exp 3524, analog gain 110 [ 134.241775] imx412 20-001a: Set exp 3524, analog gain 110, lpfr 3546 The result is then setting the sensor exposure to lower values results in darker, less exposure images and vice versa with higher exposure values. Fixes: 9214e86c0cc1 ("media: i2c: Add imx412 camera sensor driver") Tested-by: Bryan O'Donoghue # qrb5165-rb5/imx577 Signed-off-by: Bryan O'Donoghue Reviewed-by: Gjorgji Rosikopulos --- Using libcamera/SoftISP on a Qualcomm RB5 with the imx577 sensor I found that unlike on other platforms such as the Lenovo x13s/ov5675 the image was constantly getting darker and darker. At first I assumed a bug in SoftISP but, looking into the code it appeared SoftISP was requesting higher and higher exposure values which resulted in the image getting progressively darker. To my mind the software contract between user-space and kernel should be increasing exposure requests always meant higher exposure but, to be certain I asked around on IRC. Those polled agreed in principle that the software contract was consistent across sensors. Looking at the range of imx sensors, it appears this particular error has been replicated a number of times but, I haven't so far really drilled into each sensor. As a first pass I'm submitting the fix for the sensor I have but, I expect if this fix is acceptable upstream it should be pushed to most of the imx sensors with what seems to be copy/paste code for the exposure. --- Changes in v2: - Fix typo in patch 42 -> 412 - Link to v1: https://lore.kernel.org/r/20240506-b4-linux-next-camss-x13s-mmsol-integration-in-test-imx577-fix-v1-1-4b3a9426bde8@linaro.org --- drivers/media/i2c/imx412.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) --- base-commit: ff3959189f1b97e99497183d76ab9b007bec4c88 change-id: 20240506-b4-linux-next-camss-x13s-mmsol-integration-in-test-imx577-fix-f1fee6070641 Best regards, diff --git a/drivers/media/i2c/imx412.c b/drivers/media/i2c/imx412.c index 0efce329525e4..7d1f7af0a9dff 100644 --- a/drivers/media/i2c/imx412.c +++ b/drivers/media/i2c/imx412.c @@ -542,14 +542,13 @@ static int imx412_update_controls(struct imx412 *imx412, */ static int imx412_update_exp_gain(struct imx412 *imx412, u32 exposure, u32 gain) { - u32 lpfr, shutter; + u32 lpfr; int ret; lpfr = imx412->vblank + imx412->cur_mode->height; - shutter = lpfr - exposure; - dev_dbg(imx412->dev, "Set exp %u, analog gain %u, shutter %u, lpfr %u", - exposure, gain, shutter, lpfr); + dev_dbg(imx412->dev, "Set exp %u, analog gain %u, lpfr %u", + exposure, gain, lpfr); ret = imx412_write_reg(imx412, IMX412_REG_HOLD, 1, 1); if (ret) @@ -559,7 +558,7 @@ static int imx412_update_exp_gain(struct imx412 *imx412, u32 exposure, u32 gain) if (ret) goto error_release_group_hold; - ret = imx412_write_reg(imx412, IMX412_REG_EXPOSURE_CIT, 2, shutter); + ret = imx412_write_reg(imx412, IMX412_REG_EXPOSURE_CIT, 2, exposure); if (ret) goto error_release_group_hold;