From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) (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 5933247CC7C for ; Tue, 7 Jul 2026 17:06:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.41 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783443996; cv=none; b=PZvv9X8NIU9pCcqVblDzvx/9xCDghDu8CsdqVh1/Wa/v2HWAeGLRrYkHTP9bxm1v5Gjt5OoSbtO3hQM2hNBVs51LlnNBhumjt+DKzXeexcecoMuy5c1kWYst0igQ1UF7MfRDUhsXeMnM8R3/eKBQePSNJAejPexrZbLVGLI7zZg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783443996; c=relaxed/simple; bh=H+1zd/S6KU3FxonjGegQc9huOZQkI1YXzzFvdTSf87Q=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=r+jRR/5dpjZI8+yxPOW4MHPaimdEerUglClLAuOmehTkrI4kmVsPxYloVnbvTxW57+4kIYT5knzfGm/woZqi0EQoSdfDpEjCOtrYFqpGsx2qGtX0n/YvOsNRdMmYeSie8mD30xpKK8jA1BEI88ARWZGb+VqnIfmNA7+uBMz8a9o= 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=q3fNVl7V; arc=none smtp.client-ip=209.85.128.41 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="q3fNVl7V" Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-490cf3000f0so41789395e9.1 for ; Tue, 07 Jul 2026 10:06:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; t=1783443991; x=1784048791; 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=uRIESKAVbFxQF/LwbkJUhAlvRl7PTf92sUz6RcBpAQ0=; b=q3fNVl7V9aPNONS2i5GmhtgFPDiekJDdtMfr/7MyEtZhVwHyhYiG6xlAu+QVOk9RNv tLikrzkZnWSGXFpJUWCidPdB5MR4LtvlswXZ4ATetwqwi0b8RFtoSGtl1WWUpvMFXAlP yPD0o2GkYnjjs+OgqzLtYAmIbLVI6gcpgs1IujQGzpape70EagB+7FtBc3X0KKy/eosL 6lNmdJGOuROof7cwyoGTyAU2PnGbveUiZ2lmEMXGMO0qCX24OLcyDSF8lvIcCM6+7WCG J/oGKbLcuOokzh8rEuaMqFGFkTKVbiC1FOjMoikxuRBjFXR6MS/1+aXOMpL9svLNxGoy FZ+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783443991; x=1784048791; 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=uRIESKAVbFxQF/LwbkJUhAlvRl7PTf92sUz6RcBpAQ0=; b=ZErf1RC8ZmiJIQqSpiO8iqcbsM/kjxsnIOx9DJt8aURim2Dht5GZ3GOL8AFirOfHL4 9k3XB4Ap08QK4izubqeIxrw5Z/zE9mxUT+ODLyvIrJumdOQdbpmzpQy9WW9KaGD7iN/Q zh6EVDLnO2424aw8g7lDoocBlKammeEYCot4B2pjnGAJi9kofZH6M83uiIHMY9DaM2t6 ktyH8m+50rjl/IAtoICb+zfFgQ48qYMBCKfYtqIWFFe6rcIMTQbLmPQholx3G8JkUjpQ wQfNSkXZmc7uVYieCioGvQ7n50g1IWjmzuRmBvI95Obaq3zLd0NzhyOduBM5QcJ3cFDi j/uw== X-Forwarded-Encrypted: i=1; AHgh+Rp4ODeEutPwfTzzkvh0wOqOnGyIeFY3yvXdfqPYrgsXmxeAAqbx9pB7Qc0olJMVOSwUAZ8IYOG5oFLq@vger.kernel.org X-Gm-Message-State: AOJu0Yx8F+aNqsRm40iRx4ODg/e63l3QFP8dtibdPBycc+mG8PljFxc8 0kvlT6U+VNsnsB+8C7ZaTwBuSgOxKPfubB9ECPy5/o9K2+HZovneWMxcBxIorrYtqlg= X-Gm-Gg: AfdE7clazyqciB1oodmbIBerCfmxYKlsPEElXV9ftLQ3t+fy9MqI/8JZoTVb2vUsMtc U9TDW1JBemZaiEnMfVnsN4+RWC+jTLKvFo1VLjhue5SBbnyWzCBOvhsvB6uDaEHjYni9t492UH5 4vybSfraW99qDZjIsRkijeVpSynMUoqSWh2JT2AoBbdUmRaAYwTvQL8kSFHhp3AuLnYleppkQGA OzCAo56cOPIYjzly6IA642XLViRqSTyy2rKh6xRWWlhZSuMWWHea+8HOId9C44jLGIq6C1sP31Q JGDxaQxFxiUrLuoPR2PhTKeFItQFiWmuOjzobeOYBz4nCQvDpnN1EWB9vecAdYFpkV9nTPd74Bk 58ouknuzumnI257/YNTD4uC02mXXsVS7sfbwaqlSZdrhcLpB87H6YmnrDLpZ4qPPM4Wg0zYPCPU Nz1Ubd3uBT6Ior81OG416pr4ukA8Ojn3Z5Lol1G2qeoEEMhepvxpa+Y1b0Pr1xRyHa X-Received: by 2002:a05:600c:154d:b0:493:b8d9:f28b with SMTP id 5b1f17b1804b1-493df09313bmr76527035e9.23.1783443991484; Tue, 07 Jul 2026 10:06:31 -0700 (PDT) Received: from [127.0.1.1] ([2a00:1098:3142:e::8]) by smtp.googlemail.com with ESMTPSA id ffacd0b85a97d-47aa0f21543sm33644487f8f.35.2026.07.07.10.06.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jul 2026 10:06:30 -0700 (PDT) From: Dave Stevenson Date: Tue, 07 Jul 2026 18:04:51 +0100 Subject: [PATCH v2 19/20] media: imx355: Switch to using the subdev state Precedence: bulk X-Mailing-List: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260707-media-imx355-v2-19-1683ec07b897@raspberrypi.com> References: <20260707-media-imx355-v2-0-1683ec07b897@raspberrypi.com> In-Reply-To: <20260707-media-imx355-v2-0-1683ec07b897@raspberrypi.com> To: Tianshu Qiu , 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 The subdev state is now preferred rather than handling crop and format within the driver state, so switch the driver to using it. Signed-off-by: Dave Stevenson --- drivers/media/i2c/imx355.c | 169 +++++++++++++-------------------------------- 1 file changed, 49 insertions(+), 120 deletions(-) diff --git a/drivers/media/i2c/imx355.c b/drivers/media/i2c/imx355.c index 10b9cf56e8c5..bb620ebb074f 100644 --- a/drivers/media/i2c/imx355.c +++ b/drivers/media/i2c/imx355.c @@ -179,13 +179,6 @@ struct imx355 { struct imx355_hwcfg *hwcfg; const struct imx355_clk_params *clk_params; - /* - * Mutex for serialized access: - * Protect sensor set pad format and start/stop streaming safely. - * Protect access to sensor v4l2 controls. - */ - struct mutex mutex; - struct gpio_desc *reset_gpio; struct regulator_bulk_data *supplies; }; @@ -592,35 +585,11 @@ static u32 imx355_get_format_code(struct imx355 *imx355) { MEDIA_BUS_FMT_SGBRG10_1X10, MEDIA_BUS_FMT_SBGGR10_1X10, }, }; - lockdep_assert_held(&imx355->mutex); code = codes[imx355->vflip->val][imx355->hflip->val]; return code; } -/* Open sub-device */ -static int imx355_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh) -{ - struct imx355 *imx355 = to_imx355(sd); - struct v4l2_mbus_framefmt *try_fmt = - v4l2_subdev_state_get_format(fh->state, 0); - struct v4l2_rect *crop = v4l2_subdev_state_get_crop(fh->state, 0); - - mutex_lock(&imx355->mutex); - - /* Initialize try_fmt */ - try_fmt->width = imx355->cur_mode->width; - try_fmt->height = imx355->cur_mode->height; - try_fmt->code = imx355_get_format_code(imx355); - try_fmt->field = V4L2_FIELD_NONE; - - *crop = imx355->cur_mode->crop; - - mutex_unlock(&imx355->mutex); - - return 0; -} - static int imx355_set_ctrl(struct v4l2_ctrl *ctrl) { struct imx355 *imx355 = container_of(ctrl->handler, @@ -628,6 +597,9 @@ static int imx355_set_ctrl(struct v4l2_ctrl *ctrl) s64 max; int ret; + state = v4l2_subdev_get_locked_active_state(&imx355->sd); + format = v4l2_subdev_state_get_format(state, 0); + /* Propagate change of current control to all related controls */ switch (ctrl->id) { case V4L2_CID_VBLANK: @@ -700,9 +672,7 @@ static int imx355_enum_mbus_code(struct v4l2_subdev *sd, if (code->index > 0) return -EINVAL; - mutex_lock(&imx355->mutex); code->code = imx355_get_format_code(imx355); - mutex_unlock(&imx355->mutex); return 0; } @@ -716,12 +686,9 @@ static int imx355_enum_frame_size(struct v4l2_subdev *sd, if (fse->index >= ARRAY_SIZE(supported_modes)) return -EINVAL; - mutex_lock(&imx355->mutex); if (fse->code != imx355_get_format_code(imx355)) { - mutex_unlock(&imx355->mutex); return -EINVAL; } - mutex_unlock(&imx355->mutex); fse->min_width = supported_modes[fse->index].width; fse->max_width = fse->min_width; @@ -745,36 +712,6 @@ static void imx355_update_pad_format(struct imx355 *imx355, fmt->format.xfer_func = V4L2_XFER_FUNC_NONE; } -static int imx355_do_get_pad_format(struct imx355 *imx355, - struct v4l2_subdev_state *sd_state, - struct v4l2_subdev_format *fmt) -{ - struct v4l2_mbus_framefmt *framefmt; - - if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) { - framefmt = v4l2_subdev_state_get_format(sd_state, fmt->pad); - fmt->format = *framefmt; - } else { - imx355_update_pad_format(imx355, imx355->cur_mode, fmt); - } - - return 0; -} - -static int imx355_get_pad_format(struct v4l2_subdev *sd, - struct v4l2_subdev_state *sd_state, - struct v4l2_subdev_format *fmt) -{ - struct imx355 *imx355 = to_imx355(sd); - int ret; - - mutex_lock(&imx355->mutex); - ret = imx355_do_get_pad_format(imx355, sd_state, fmt); - mutex_unlock(&imx355->mutex); - - return ret; -} - static int imx355_set_pad_format(struct v4l2_subdev *sd, struct v4l2_subdev_state *sd_state, @@ -783,12 +720,11 @@ imx355_set_pad_format(struct v4l2_subdev *sd, struct imx355 *imx355 = to_imx355(sd); const struct imx355_mode *mode; struct v4l2_mbus_framefmt *framefmt; + struct v4l2_rect *crop; s32 vblank_def; s64 h_blank; u32 height; - mutex_lock(&imx355->mutex); - /* * Only one bayer order is supported. * It depends on the flip settings. @@ -800,10 +736,18 @@ imx355_set_pad_format(struct v4l2_subdev *sd, width, height, fmt->format.width, fmt->format.height); imx355_update_pad_format(imx355, mode, fmt); - if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) { - framefmt = v4l2_subdev_state_get_format(sd_state, fmt->pad); - *framefmt = fmt->format; - } else { + + framefmt = v4l2_subdev_state_get_format(sd_state, 0); + + *framefmt = fmt->format; + + crop = v4l2_subdev_state_get_crop(sd_state, 0); + crop->width = mode->crop.width; + crop->height = mode->crop.height; + crop->left = mode->crop.left; + crop->top = mode->crop.top; + + if (fmt->which == V4L2_SUBDEV_FORMAT_ACTIVE) { imx355->cur_mode = mode; /* Update limits and set FPS to default */ height = imx355->cur_mode->height; @@ -822,41 +766,17 @@ imx355_set_pad_format(struct v4l2_subdev *sd, h_blank, 1, h_blank); } - mutex_unlock(&imx355->mutex); - return 0; } -static void -__imx355_get_pad_crop(struct imx355 *imx355, - struct v4l2_subdev_state *sd_state, unsigned int pad, - enum v4l2_subdev_format_whence which, struct v4l2_rect *r) -{ - switch (which) { - case V4L2_SUBDEV_FORMAT_TRY: - *r = *v4l2_subdev_state_get_crop(sd_state, pad); - break; - case V4L2_SUBDEV_FORMAT_ACTIVE: - *r = imx355->cur_mode->crop; - break; - } -} - static int imx355_get_selection(struct v4l2_subdev *sd, struct v4l2_subdev_state *sd_state, struct v4l2_subdev_selection *sel) { switch (sel->target) { - case V4L2_SEL_TGT_CROP: { - struct imx355 *imx355 = to_imx355(sd); - - mutex_lock(&imx355->mutex); - __imx355_get_pad_crop(imx355, sd_state, sel->pad, sel->which, - &sel->r); - mutex_unlock(&imx355->mutex); - + case V4L2_SEL_TGT_CROP: + sel->r = *v4l2_subdev_state_get_crop(sd_state, 0); return 0; - } case V4L2_SEL_TGT_CROP_DEFAULT: case V4L2_SEL_TGT_CROP_BOUNDS: case V4L2_SEL_TGT_NATIVE_SIZE: @@ -871,6 +791,21 @@ static int imx355_get_selection(struct v4l2_subdev *sd, return -EINVAL; } +static int imx355_entity_init_state(struct v4l2_subdev *subdev, + struct v4l2_subdev_state *sd_state) +{ + struct v4l2_subdev_format fmt = { }; + + fmt.which = sd_state ? V4L2_SUBDEV_FORMAT_TRY : V4L2_SUBDEV_FORMAT_ACTIVE; + fmt.format.code = MEDIA_BUS_FMT_SRGGB10_1X10; + fmt.format.width = supported_modes[0].width; + fmt.format.height = supported_modes[0].height; + + imx355_set_pad_format(subdev, sd_state, &fmt); + + return 0; +} + /* Start streaming */ static int imx355_start_streaming(struct imx355 *imx355) { @@ -958,12 +893,10 @@ static int imx355_set_stream(struct v4l2_subdev *sd, int enable) struct imx355 *imx355 = to_imx355(sd); int ret = 0; - mutex_lock(&imx355->mutex); - if (enable) { ret = pm_runtime_resume_and_get(imx355->dev); if (ret < 0) - goto err_unlock; + return ret; /* * Apply default & customized values @@ -981,14 +914,10 @@ static int imx355_set_stream(struct v4l2_subdev *sd, int enable) __v4l2_ctrl_grab(imx355->vflip, enable); __v4l2_ctrl_grab(imx355->hflip, enable); - mutex_unlock(&imx355->mutex); - return ret; err_rpm_put: pm_runtime_put_autosuspend(imx355->dev); -err_unlock: - mutex_unlock(&imx355->mutex); return ret; } @@ -1022,7 +951,7 @@ static const struct v4l2_subdev_video_ops imx355_video_ops = { static const struct v4l2_subdev_pad_ops imx355_pad_ops = { .enum_mbus_code = imx355_enum_mbus_code, - .get_fmt = imx355_get_pad_format, + .get_fmt = v4l2_subdev_get_fmt, .set_fmt = imx355_set_pad_format, .enum_frame_size = imx355_enum_frame_size, .get_selection = imx355_get_selection, @@ -1039,7 +968,7 @@ static const struct media_entity_operations imx355_subdev_entity_ops = { }; static const struct v4l2_subdev_internal_ops imx355_internal_ops = { - .open = imx355_open, + .init_state = imx355_entity_init_state, }; static int imx355_power_off(struct device *dev) @@ -1105,7 +1034,6 @@ static int imx355_init_controls(struct imx355 *imx355) if (ret) return ret; - ctrl_hdlr->lock = &imx355->mutex; imx355->link_freq = v4l2_ctrl_new_int_menu(ctrl_hdlr, &imx355_ctrl_ops, V4L2_CID_LINK_FREQ, 0, 0, &imx355->hwcfg->link_freq_menu); @@ -1254,8 +1182,6 @@ static int imx355_probe(struct i2c_client *client) imx355->dev = &client->dev; - mutex_init(&imx355->mutex); - imx355->regmap = devm_cci_regmap_init_i2c(client, 16); if (IS_ERR(imx355->regmap)) { dev_err(imx355->dev, "Unable to initialize I2C\n"); @@ -1285,7 +1211,7 @@ static int imx355_probe(struct i2c_client *client) &imx355->supplies); if (ret) { dev_err_probe(imx355->dev, ret, "could not get regulators"); - goto error_probe; + return ret; } imx355->reset_gpio = devm_gpiod_get_optional(imx355->dev, "reset", @@ -1293,7 +1219,7 @@ static int imx355_probe(struct i2c_client *client) if (IS_ERR(imx355->reset_gpio)) { ret = dev_err_probe(imx355->dev, PTR_ERR(imx355->reset_gpio), "failed to get gpios"); - goto error_probe; + return ret; } /* Initialize subdev */ @@ -1302,13 +1228,12 @@ static int imx355_probe(struct i2c_client *client) imx355->hwcfg = imx355_get_hwcfg(imx355); if (!imx355->hwcfg) { dev_err(imx355->dev, "failed to get hwcfg"); - ret = -ENODEV; - goto error_probe; + return -ENODEV; } ret = imx355_power_on(imx355->dev); if (ret) - goto error_probe; + return ret; /* Check module identity */ ret = imx355_identify_module(imx355); @@ -1341,6 +1266,13 @@ static int imx355_probe(struct i2c_client *client) goto error_handler_free; } + imx355->sd.state_lock = imx355->ctrl_handler.lock; + ret = v4l2_subdev_init_finalize(&imx355->sd); + if (ret < 0) { + dev_err_probe(imx355->dev, ret, "subdev init error\n"); + goto error_handler_free; + } + /* * Device is already turned on by i2c-core with ACPI domain PM. * Enable runtime PM and turn off the device. @@ -1360,6 +1292,7 @@ static int imx355_probe(struct i2c_client *client) error_media_entity_runtime_pm: pm_runtime_disable(imx355->dev); pm_runtime_set_suspended(imx355->dev); + v4l2_subdev_cleanup(&imx355->sd); media_entity_cleanup(&imx355->sd.entity); error_handler_free: @@ -1368,9 +1301,6 @@ static int imx355_probe(struct i2c_client *client) error_power_off: imx355_power_off(imx355->dev); -error_probe: - mutex_destroy(&imx355->mutex); - return ret; } @@ -1380,6 +1310,7 @@ static void imx355_remove(struct i2c_client *client) struct imx355 *imx355 = to_imx355(sd); v4l2_async_unregister_subdev(sd); + v4l2_subdev_cleanup(sd); media_entity_cleanup(&sd->entity); v4l2_ctrl_handler_free(sd->ctrl_handler); @@ -1389,8 +1320,6 @@ static void imx355_remove(struct i2c_client *client) imx355_power_off(imx355->dev); pm_runtime_set_suspended(imx355->dev); } - - mutex_destroy(&imx355->mutex); } static const struct acpi_device_id imx355_acpi_ids[] __maybe_unused = { -- 2.34.1