From mboxrd@z Thu Jan 1 00:00:00 1970 From: Richard Leitner Date: Tue, 10 Nov 2026 14:10:14 +0100 Subject: [PATCH v3 5/8] media: i2c: ov9282: add refresh of additional ranges on a mode change MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20261110-ov9282-fixes-v3-5-cb6df80cbc22@linux.dev> References: <20261110-ov9282-fixes-v3-0-cb6df80cbc22@linux.dev> In-Reply-To: <20261110-ov9282-fixes-v3-0-cb6df80cbc22@linux.dev> To: Sakari Ailus , Dave Stevenson , Mauro Carvalho Chehab , Daniele Alessandrelli , "Paul J. Murphy" , Martina Krasteva , Richard Leitner , Hans Verkuil , Bryan O'Donoghue , Jacopo Mondi Cc: Mauro Carvalho Chehab , Gyula Kelemen , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org X-Mailer: b4 0.16.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1794316220; l=2624; i=richard.leitner@linux.dev; s=20250225; h=from:subject:message-id; bh=xDaYCG/EggX3Dks5xTqVdlW64wbP1xefCkWQCQ5i5Sg=; b=ZVlPXn9vOh24xshoxJgpv8xfLNx70LMXxCYpqn32rvF4V/GKagXHku3NGDFd2zBm3GWZQ5ed8 utUkrSoJ2ioBxhBHxK2L6dH7/AeROdSX+0kNrIGYhovAitv8jSdLOY0 X-Developer-Key: i=richard.leitner@linux.dev; a=ed25519; pk=8hZNyyyQFqZ5ruVJsSGBSPIrmJpfDm5HwHU4QVOP1Pk= X-Endpoint-Received: by B4 Relay for richard.leitner@linux.dev/20250225 with auth_id=350 List-Id: B4 Relay Submissions ov9282_update_controls() updates the pixel rate, hblank and vblank, but currently misses the exposure range and flash_duration. Refresh both, and commit cur_mode and code in ov9282_set_pad_format() before the call so the refresh and any nested s_ctrl see the incoming format. Fixes: 14ea315bbeb75 ("media: i2c: Add ov9282 camera sensor driver") Cc: stable@vger.kernel.org Reviewed-by: Dave Stevenson Signed-off-by: Richard Leitner --- drivers/media/i2c/ov9282.c | 36 +++++++++++++++++++++++++++++++----- 1 file changed, 31 insertions(+), 5 deletions(-) diff --git a/drivers/media/i2c/ov9282.c b/drivers/media/i2c/ov9282.c index 44ac2043f5651..86a62ccd68654 100644 --- a/drivers/media/i2c/ov9282.c +++ b/drivers/media/i2c/ov9282.c @@ -548,6 +548,7 @@ static int ov9282_update_controls(struct ov9282 *ov9282, { u32 hblank_min; s64 pixel_rate; + u32 lpfr; int ret; ret = __v4l2_ctrl_s_ctrl(ov9282->link_freq_ctrl, mode->link_freq_idx); @@ -568,8 +569,20 @@ static int ov9282_update_controls(struct ov9282 *ov9282, if (ret) return ret; - return __v4l2_ctrl_modify_range(ov9282->vblank_ctrl, mode->vblank_min, - mode->vblank_max, 1, mode->vblank); + ret = __v4l2_ctrl_modify_range(ov9282->vblank_ctrl, mode->vblank_min, + mode->vblank_max, 1, mode->vblank); + if (ret) + return ret; + + lpfr = ov9282->vblank_ctrl->val + mode->height; + ret = __v4l2_ctrl_modify_range(ov9282->exp_ctrl, OV9282_EXPOSURE_MIN, + lpfr - OV9282_EXPOSURE_OFFSET, + OV9282_EXPOSURE_STEP, + OV9282_EXPOSURE_DEFAULT); + if (ret) + return ret; + + return ov9282_update_ctrl_flash_duration(ov9282); } /** @@ -833,10 +846,23 @@ static int ov9282_set_pad_format(struct v4l2_subdev *sd, framefmt = v4l2_subdev_state_get_format(sd_state, fmt->pad); *framefmt = fmt->format; } else { + const struct ov9282_mode *old_mode = ov9282->cur_mode; + u32 old_code = ov9282->code; + + /* + * Commit before refreshing the ranges. ov9282_update_controls() + * and the nested ov9282_set_ctrl() calls it triggers derive the + * frame length and the line time from cur_mode and code, so + * they have to describe the incoming format, not the outgoing + * one. + */ + ov9282->cur_mode = mode; + ov9282->code = code; + ret = ov9282_update_controls(ov9282, mode, fmt); - if (!ret) { - ov9282->cur_mode = mode; - ov9282->code = code; + if (ret) { + ov9282->cur_mode = old_mode; + ov9282->code = old_code; } } -- 2.53.0