From nobody Tue Aug 25 09:44:49 2026 Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) (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 64DB0481A96 for ; Wed, 8 Jul 2026 14:49:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783522176; cv=none; b=T1j4YQ/Ye3HJA4kfm83Ptkc9AII5/oT8DWoMt9wPlI4lcnF6VeR8LHB0jNkI6Rrz6CQ4AcnAM4/nFmnR+H7wNp+w8lWdopOF656JsiPpmFo3NNhphsSX0Sor8IMRWy7rVoxpp4LsywGS7gGG+rd15hBQ0WkCfunfe5T8Z/T18Yk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783522176; c=relaxed/simple; bh=V7cfXfus1wMTH8uUlTulTCFw9RvrshHM+7AA6flR5yk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=gPYaLo1WVnXQh1PMV9bAihV/1ibLxNfSW9RIdhQkYFIy9HWS+Lp2bvRXPeYwvS5XQYgPu+4AETDWlzYZJyGCnkdXhR9PtwuawTIjguW6j9xIauVeqF+QXx2UsMdzHsZgwv2pQjRDhXymdT/hVeYNb1LxPcjZDegwm8OfqA7dXwc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=raspberrypi.com; spf=pass smtp.mailfrom=raspberrypi.com; dkim=pass (2048-bit key) header.d=raspberrypi.com header.i=@raspberrypi.com header.b=gDL1S+W+; arc=none smtp.client-ip=209.85.128.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=raspberrypi.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=raspberrypi.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="gDL1S+W+" Received: by mail-wm1-f43.google.com with SMTP id 5b1f17b1804b1-493e4cccd8dso3412665e9.2 for ; Wed, 08 Jul 2026 07:49:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; t=1783522165; x=1784126965; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=zYXkUhjNUNGBxpm6qSdNLGjTwbO67Pooqx5qDG7FHec=; b=gDL1S+W+kVZMt3oTlU+dVDmIvstHM4u+kj3XUL9GiMAqnNuSfHGNeOUsowcuH4nUvB 3Qb2vo9O/tLB9WtI2wSPqZSNJofa5SAQYUyENOTtyAx/3H9KJbZv2s3ejkFyAtfQ94Jb h54JjGNeJ+ZBSkLT69OBnWp/rJ7v3zm+UBFLkmwpcg1M5PrLQ0/VGxL7TwZZ/HeAe8l4 wycXegyet3wbNh116hnEJyWtXV7eYeeMObNMUaHWtuRtWWurgj/ZWwaZVwJ1wxaPu6c6 q6KzFQf29p5SfDWiWYMrBso6qx1gX76aVujBCR+q4LkTqtyq868sb/jw9xUI8ag48wrj aJAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783522165; x=1784126965; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=zYXkUhjNUNGBxpm6qSdNLGjTwbO67Pooqx5qDG7FHec=; b=f0DZZgRW6H3Q5M61nsY2kxAUra2Ar3GIdAiTuj8y7ayQkaLSc8eHhIrC7qA6cCkXgT Lbmc2PG2qjoO3wcUH6+uAV44ZEgE9RGsvXr/jnbvXMpaPiyWHQ34KA+Qyi+MWOZVjBlN cxO0aYTYTLJwzV15BwGoMGHcMCpidfhsDdvod5WLk9SqD7+haQwUXK/Xgguk0l2CxZmV TQYQrsOLGxYyiB7+tmRrlwiY5/tnjDoYvKzICFvl9w/9Y+L7CtvRg8dMp61TU9NLVu1x CxyqL6Zm55ZfE2DUGVjJwUd9DLe38Y6U/WtkydG40Cff9MOk8thrL0x6kkQli1E4SPvC R0KQ== X-Forwarded-Encrypted: i=1; AHgh+RreAs1s90vrORhtSKGiXmY/B+QQ20Fqrao3WJGKYjdK66GZJtGwmT3/FSbGzvmhbj+oiwpSfizPbx+qCjQ=@vger.kernel.org X-Gm-Message-State: AOJu0YyaqNKH01c7FbtK6N9/kK4O7vFLkUN421tr6qlIhoyzYulMs2tH puu9//mKu1vWYCYVu4kkO7NFIou97SEYN5TlAd0dOw5z96HLM9pgnaW2L6/yOPEP2b4= X-Gm-Gg: AfdE7ckY4fV/bsOUhJevHYi2WfhiMhcna2OCOyRuKLu/PXXLeBKoGeqHrc0bBRIZbu9 tom7NjcvtOuI5DX6GZ+OVWLo0uGdJnkrsd/WIVm/TUsqz1fxhori6kkxR7LK93IBoUANJpEUiT/ GmcHMchv82x7ECUbsqvuf63Av3xGnC+S+aK3Rv9AbJAfN8l+RRkdAXAnDTQPZHI00/TDL+MKwP6 7TvkDCpAtsUVzBeyexG4+CDPL1pV0wJxtNA87VKXekJjv3fKCSYogDkWaxir4ThexbvbRQxbPvM cBc4rDzCIyVIRnRFONJwV1YwPJBkRrdl7upXrD3EI4HFvkkiN5z49pQcEWYnqTxKpaR+dIrwaZn PFnC5oSceTHbdi6Er7+5Lw1MT//r443o/oY4KnRdQ/qmsG384D0wUmR2mZC07rixyCbuUcGu6FX JDskIGs9hWjDHbAdcnPyHXbrtkh+L+pDhP5A2eeSya+km966JlE2v2S058dU/kwszy X-Received: by 2002:a05:600c:528c:b0:493:d21f:8f98 with SMTP id 5b1f17b1804b1-493e68de964mr30032775e9.36.1783522165093; Wed, 08 Jul 2026 07:49:25 -0700 (PDT) Received: from [127.0.1.1] ([2a00:1098:3142:e::8]) by smtp.googlemail.com with ESMTPSA id 5b1f17b1804b1-493e0fbd355sm135363315e9.13.2026.07.08.07.49.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jul 2026 07:49:24 -0700 (PDT) From: Dave Stevenson Date: Wed, 08 Jul 2026 15:48:56 +0100 Subject: [PATCH v3 20/20] media: imx355: Remove storing cur_mode in the state Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260708-media-imx355-v3-20-9df386a623d7@raspberrypi.com> References: <20260708-media-imx355-v3-0-9df386a623d7@raspberrypi.com> In-Reply-To: <20260708-media-imx355-v3-0-9df386a623d7@raspberrypi.com> To: Sakari Ailus , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Richard Acayan Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, David Heidelberg , Jacopo Mondi , devicetree@vger.kernel.org, Dave Stevenson X-Mailer: b4 0.14.1 All the information for the mode is now stored within the subdev state, so configure the sensor based on that. Signed-off-by: Dave Stevenson --- drivers/media/i2c/imx355.c | 66 ++++++++++++++++++++++--------------------= ---- 1 file changed, 32 insertions(+), 34 deletions(-) diff --git a/drivers/media/i2c/imx355.c b/drivers/media/i2c/imx355.c index ee012efe25bf..8e5eb5998591 100644 --- a/drivers/media/i2c/imx355.c +++ b/drivers/media/i2c/imx355.c @@ -173,9 +173,6 @@ struct imx355 { struct v4l2_ctrl *vflip; struct v4l2_ctrl *hflip; =20 - /* Current mode */ - const struct imx355_mode *cur_mode; - struct imx355_hwcfg *hwcfg; const struct imx355_clk_params *clk_params; =20 @@ -607,7 +604,7 @@ static int imx355_set_ctrl(struct v4l2_ctrl *ctrl) switch (ctrl->id) { case V4L2_CID_VBLANK: /* Update max exposure while meeting expected vblanking */ - max =3D imx355->cur_mode->height + ctrl->val - IMX355_EXPOSURE_OFFSET; + max =3D format->height + ctrl->val - IMX355_EXPOSURE_OFFSET; __v4l2_ctrl_modify_range(imx355->exposure, imx355->exposure->minimum, max, imx355->exposure->step, max); @@ -638,7 +635,7 @@ static int imx355_set_ctrl(struct v4l2_ctrl *ctrl) case V4L2_CID_VBLANK: /* Update FLL that meets expected vertical blanking */ ret =3D cci_write(imx355->regmap, IMX355_REG_FLL, - imx355->cur_mode->height + ctrl->val, NULL); + format->height + ctrl->val, NULL); break; case V4L2_CID_TEST_PATTERN: ret =3D cci_write(imx355->regmap, IMX355_REG_TEST_PATTERN, @@ -724,9 +721,7 @@ imx355_set_pad_format(struct v4l2_subdev *sd, const struct imx355_mode *mode; struct v4l2_mbus_framefmt *framefmt; struct v4l2_rect *crop; - s32 vblank_def; s64 h_blank; - u32 height; =20 /* * Only one bayer order is supported. @@ -750,16 +745,14 @@ imx355_set_pad_format(struct v4l2_subdev *sd, crop->top =3D mode->crop.top; =20 if (fmt->which =3D=3D V4L2_SUBDEV_FORMAT_ACTIVE) { - imx355->cur_mode =3D mode; /* Update limits and set FPS to default */ - height =3D imx355->cur_mode->height; - vblank_def =3D imx355->cur_mode->fll_def - height; - height =3D IMX355_FLL_MAX - height; __v4l2_ctrl_modify_range(imx355->vblank, IMX355_VBLANK_MIN, - height, 1, vblank_def); - __v4l2_ctrl_s_ctrl(imx355->vblank, vblank_def); + IMX355_FLL_MAX - mode->height, 1, + mode->fll_def - mode->height); + __v4l2_ctrl_s_ctrl(imx355->vblank, mode->fll_def - mode->height); + + h_blank =3D mode->llp - mode->width; =20 - h_blank =3D mode->llp - imx355->cur_mode->width; /* * Currently hblank is not changeable. * So FPS control is done only by vblank. @@ -811,9 +804,11 @@ static int imx355_entity_init_state(struct v4l2_subdev= *subdev, /* Start streaming */ static int imx355_start_streaming(struct imx355 *imx355) { - const struct imx355_reg_list *reg_list; + const struct v4l2_mbus_framefmt *fmt; + struct v4l2_subdev_state *state; const struct imx355_mode *mode; int lane_idx =3D imx355->hwcfg->num_lanes =3D=3D 4 ? 0 : 1; + struct v4l2_rect *crop; u64 link_bitrate; u8 binning_mode; int ret =3D 0; @@ -822,25 +817,29 @@ static int imx355_start_streaming(struct imx355 *imx3= 55) cci_multi_reg_write(imx355->regmap, imx355_global_regs, ARRAY_SIZE(imx355_global_regs), &ret); =20 - /* Apply default values of current mode */ - mode =3D imx355->cur_mode; - reg_list =3D &mode->reg_list; - cci_multi_reg_write(imx355->regmap, reg_list->regs, - reg_list->num_of_regs, &ret); + /* Apply values of current mode */ + state =3D v4l2_subdev_get_locked_active_state(&imx355->sd); + fmt =3D v4l2_subdev_state_get_format(state, 0); + crop =3D v4l2_subdev_state_get_crop(state, 0); + mode =3D v4l2_find_nearest_size(supported_modes, + ARRAY_SIZE(supported_modes), + width, height, fmt->width, fmt->height); + cci_multi_reg_write(imx355->regmap, mode->reg_list.regs, + mode->reg_list.num_of_regs, &ret); =20 /* Set readout crop and size registers */ - cci_write(imx355->regmap, IMX355_REG_X_ADD_START, mode->crop.left, + cci_write(imx355->regmap, IMX355_REG_X_ADD_START, crop->left, &ret); - cci_write(imx355->regmap, IMX355_REG_Y_ADD_START, mode->crop.top, &ret); + cci_write(imx355->regmap, IMX355_REG_Y_ADD_START, crop->top, &ret); cci_write(imx355->regmap, IMX355_REG_X_ADD_END, - mode->crop.width + mode->crop.left - 1, &ret); + crop->width + crop->left - 1, &ret); cci_write(imx355->regmap, IMX355_REG_Y_ADD_END, - mode->crop.height + mode->crop.top - 1, &ret); - cci_write(imx355->regmap, IMX355_REG_X_OUT_SIZE, mode->width, &ret); - cci_write(imx355->regmap, IMX355_REG_Y_OUT_SIZE, mode->height, &ret); + crop->height + crop->top - 1, &ret); + cci_write(imx355->regmap, IMX355_REG_X_OUT_SIZE, fmt->width, &ret); + cci_write(imx355->regmap, IMX355_REG_Y_OUT_SIZE, fmt->height, &ret); =20 - binning_mode =3D ((mode->crop.width / mode->width) << 4) | - (mode->crop.height / mode->height); + binning_mode =3D ((crop->width / fmt->width) << 4) | + (crop->height / fmt->height); cci_write(imx355->regmap, IMX355_REG_BINNING_MODE, binning_mode =3D=3D 0x11 ? 0x00 : 0x01, &ret); cci_write(imx355->regmap, IMX355_REG_BINNING_TYPE, binning_mode, &ret); @@ -871,7 +870,7 @@ static int imx355_start_streaming(struct imx355 *imx355) =20 /* set line length */ cci_write(imx355->regmap, IMX355_REG_LLP, - imx355->hblank->val + imx355->cur_mode->width, &ret); + imx355->hblank->val + fmt->width, &ret); =20 /* Apply customized values from user */ if (!ret) @@ -893,6 +892,7 @@ static int imx355_stop_streaming(struct imx355 *imx355) static int imx355_set_stream(struct v4l2_subdev *sd, int enable) { struct imx355 *imx355 =3D to_imx355(sd); + struct v4l2_subdev_state *state; int ret =3D 0; =20 if (enable) { @@ -904,7 +904,9 @@ static int imx355_set_stream(struct v4l2_subdev *sd, in= t enable) * Apply default & customized values * and then start streaming. */ + state =3D v4l2_subdev_lock_and_get_active_state(sd); ret =3D imx355_start_streaming(imx355); + v4l2_subdev_unlock_state(state); if (ret) goto err_rpm_put; } else { @@ -1024,11 +1026,11 @@ static int imx355_init_controls(struct imx355 *imx3= 55) { struct v4l2_fwnode_device_properties props; struct v4l2_ctrl_handler *ctrl_hdlr; + const struct imx355_mode *mode =3D &supported_modes[0]; s64 exposure_max; s64 vblank_def; s64 hblank; u64 pixel_rate; - const struct imx355_mode *mode; int ret; =20 ctrl_hdlr =3D &imx355->ctrl_handler; @@ -1050,7 +1052,6 @@ static int imx355_init_controls(struct imx355 *imx355) pixel_rate, pixel_rate, 1, pixel_rate); =20 /* Initialize vblank/hblank/exposure parameters based on current mode */ - mode =3D imx355->cur_mode; vblank_def =3D mode->fll_def - mode->height; imx355->vblank =3D v4l2_ctrl_new_std(ctrl_hdlr, &imx355_ctrl_ops, V4L2_CID_VBLANK, IMX355_VBLANK_MIN, @@ -1243,9 +1244,6 @@ static int imx355_probe(struct i2c_client *client) goto error_power_off; } =20 - /* Set default mode to max resolution */ - imx355->cur_mode =3D &supported_modes[0]; - ret =3D imx355_init_controls(imx355); if (ret) { dev_err(imx355->dev, "failed to init controls: %d", ret); --=20 2.34.1