From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 389C01FAA; Thu, 9 May 2024 12:45:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=213.167.242.64 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715258757; cv=none; b=BYNhsl7SSmTZ/GBtbS8hmjv8YmsAXv6e9RYdmKYUM5Ei1Qu4qUBbcTu1v1LAdXIXvQHVqxw53NWsfxpbuc9aRW3kh6ALAMvCS9yMD2gWlrHtPINdkb5m5IuVy8QmVYqEG6Fc15RIuy+uz8Z5uWpew28EYivXy/ag69HMmVevHps= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715258757; c=relaxed/simple; bh=1ijmyHoH+k+wo9ToIqyJvEJDeDa8M+ChH+K/D+G7UhA=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=hY2t4JRlFyqEhd67cpUBmukXjwTwMwh0ccoY51wDrFInmDkbX/NQMnv+7Sb2RF382Y0g19UsN3NN45DCv/yN5sD6KZk9NLwSd4fj2ws+V050AlaAYvHGrt8IQJ1obWeqUVzTch5l8ViZBDlQoWm9MfxtiFzd8epFnBFG6ZjPCnE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ideasonboard.com; spf=pass smtp.mailfrom=ideasonboard.com; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b=psRNO0RC; arc=none smtp.client-ip=213.167.242.64 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ideasonboard.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ideasonboard.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="psRNO0RC" Received: from pendragon.ideasonboard.com (81-175-209-231.bb.dnainternet.fi [81.175.209.231]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id E15C0B3; Thu, 9 May 2024 14:45:49 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1715258750; bh=1ijmyHoH+k+wo9ToIqyJvEJDeDa8M+ChH+K/D+G7UhA=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=psRNO0RCXNKswYJVLWLyzdFhN/8XfQmmt6ABda4qVMRZBWaEoL2MAQaICNyniJyGg MV5krYZ8QsyrDiLeWm+EC9Of0UcgZg57/Lz6hHJqZENpRzCifK1hEcgrNO4lHJtmxu RmEowCctjqJjGm4fkjr2iMyWXtcLLd2a7sOP3OYw= Date: Thu, 9 May 2024 15:45:44 +0300 From: Laurent Pinchart To: Jacopo Mondi Cc: Niklas =?utf-8?Q?S=C3=B6derlund?= , Sakari Ailus , Kieran Bingham , Tomi Valkeinen , linux-media@vger.kernel.org, linux-renesas-soc@vger.kernel.org Subject: Re: [PATCH v2 07/11] media: adv748x-csi2: Use the subdev active state Message-ID: <20240509124544.GD17123@pendragon.ideasonboard.com> References: <20240506164941.110389-1-jacopo.mondi@ideasonboard.com> <20240506164941.110389-8-jacopo.mondi@ideasonboard.com> Precedence: bulk X-Mailing-List: linux-renesas-soc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20240506164941.110389-8-jacopo.mondi@ideasonboard.com> Hi Jacopo, Thank you for the patch. On Mon, May 06, 2024 at 06:49:35PM +0200, Jacopo Mondi wrote: > Initialize and use the subdev active state to store the subdevice > format. > > This simplifies the implementation of the get_fmt and set_fmt pad > operations. > > Signed-off-by: Jacopo Mondi Reviewed-by: Laurent Pinchart > --- > drivers/media/i2c/adv748x/adv748x-csi2.c | 107 +++++++++-------------- > drivers/media/i2c/adv748x/adv748x.h | 1 - > 2 files changed, 42 insertions(+), 66 deletions(-) > > diff --git a/drivers/media/i2c/adv748x/adv748x-csi2.c b/drivers/media/i2c/adv748x/adv748x-csi2.c > index 3f22dc426d7a..76b5eefdc2a7 100644 > --- a/drivers/media/i2c/adv748x/adv748x-csi2.c > +++ b/drivers/media/i2c/adv748x/adv748x-csi2.c > @@ -6,7 +6,6 @@ > */ > > #include > -#include > > #include > #include > @@ -71,7 +70,33 @@ static int adv748x_csi2_register_link(struct adv748x_csi2 *tx, > > /* ----------------------------------------------------------------------------- > * v4l2_subdev_internal_ops > - * > + */ > + > +static int adv748x_csi2_init_state(struct v4l2_subdev *sd, > + struct v4l2_subdev_state *state) > +{ > + static const struct v4l2_mbus_framefmt adv748x_csi2_default_fmt = { > + .width = 1280, > + .height = 720, > + .code = MEDIA_BUS_FMT_UYVY8_1X16, > + .colorspace = V4L2_COLORSPACE_SRGB, > + .field = V4L2_FIELD_NONE, > + .ycbcr_enc = V4L2_YCBCR_ENC_DEFAULT, > + .quantization = V4L2_QUANTIZATION_DEFAULT, > + .xfer_func = V4L2_XFER_FUNC_DEFAULT, > + }; > + struct v4l2_mbus_framefmt *fmt; > + > + fmt = v4l2_subdev_state_get_format(state, ADV748X_CSI2_SINK); > + *fmt = adv748x_csi2_default_fmt; > + > + fmt = v4l2_subdev_state_get_format(state, ADV748X_CSI2_SOURCE); > + *fmt = adv748x_csi2_default_fmt; > + > + return 0; > +} > + > +/* > * We use the internal registered operation to be able to ensure that our > * incremental subdevices (not connected in the forward path) can be registered > * against the resulting video path and media device. > @@ -121,6 +146,7 @@ static int adv748x_csi2_registered(struct v4l2_subdev *sd) > } > > static const struct v4l2_subdev_internal_ops adv748x_csi2_internal_ops = { > + .init_state = adv748x_csi2_init_state, > .registered = adv748x_csi2_registered, > }; > > @@ -173,41 +199,6 @@ static int adv748x_csi2_enum_mbus_code(struct v4l2_subdev *sd, > return 0; > } > > -static struct v4l2_mbus_framefmt * > -adv748x_csi2_get_pad_format(struct v4l2_subdev *sd, > - struct v4l2_subdev_state *sd_state, > - unsigned int pad, u32 which) > -{ > - struct adv748x_csi2 *tx = adv748x_sd_to_csi2(sd); > - > - if (which == V4L2_SUBDEV_FORMAT_TRY) > - return v4l2_subdev_state_get_format(sd_state, pad); > - > - return &tx->format; > -} > - > -static int adv748x_csi2_get_format(struct v4l2_subdev *sd, > - struct v4l2_subdev_state *sd_state, > - struct v4l2_subdev_format *sdformat) > -{ > - struct adv748x_csi2 *tx = adv748x_sd_to_csi2(sd); > - struct adv748x_state *state = tx->state; > - struct v4l2_mbus_framefmt *mbusformat; > - > - mbusformat = adv748x_csi2_get_pad_format(sd, sd_state, sdformat->pad, > - sdformat->which); > - if (!mbusformat) > - return -EINVAL; > - > - mutex_lock(&state->mutex); > - > - sdformat->format = *mbusformat; > - > - mutex_unlock(&state->mutex); > - > - return 0; > -} > - > static bool adv748x_csi2_is_fmt_supported(struct adv748x_csi2 *tx, > unsigned int code) > { > @@ -230,9 +221,10 @@ static int adv748x_csi2_set_format(struct v4l2_subdev *sd, > struct v4l2_subdev_format *sdformat) > { > struct adv748x_csi2 *tx = adv748x_sd_to_csi2(sd); > - struct adv748x_state *state = tx->state; > struct v4l2_mbus_framefmt *mbusformat; > - int ret = 0; > + > + if (sdformat->pad == ADV748X_CSI2_SOURCE) > + return v4l2_subdev_get_fmt(sd, sd_state, sdformat); > > /* > * Make sure the format is supported, if not default it to > @@ -241,34 +233,14 @@ static int adv748x_csi2_set_format(struct v4l2_subdev *sd, > if (!adv748x_csi2_is_fmt_supported(tx, sdformat->format.code)) > sdformat->format.code = MEDIA_BUS_FMT_UYVY8_1X16; > > - mbusformat = adv748x_csi2_get_pad_format(sd, sd_state, sdformat->pad, > - sdformat->which); > - if (!mbusformat) > - return -EINVAL; > - > - mutex_lock(&state->mutex); > - > - if (sdformat->pad == ADV748X_CSI2_SOURCE) { > - const struct v4l2_mbus_framefmt *sink_fmt; > - > - sink_fmt = adv748x_csi2_get_pad_format(sd, sd_state, > - ADV748X_CSI2_SINK, > - sdformat->which); > - > - if (!sink_fmt) { > - ret = -EINVAL; > - goto unlock; > - } > - > - sdformat->format = *sink_fmt; > - } > - > + mbusformat = v4l2_subdev_state_get_format(sd_state, sdformat->pad); > *mbusformat = sdformat->format; > > -unlock: > - mutex_unlock(&state->mutex); > + /* Propagate format to the source pad. */ > + mbusformat = v4l2_subdev_state_get_format(sd_state, ADV748X_CSI2_SOURCE); > + *mbusformat = sdformat->format; > > - return ret; > + return 0; > } > > static int adv748x_csi2_get_mbus_config(struct v4l2_subdev *sd, unsigned int pad, > @@ -287,7 +259,7 @@ static int adv748x_csi2_get_mbus_config(struct v4l2_subdev *sd, unsigned int pad > > static const struct v4l2_subdev_pad_ops adv748x_csi2_pad_ops = { > .enum_mbus_code = adv748x_csi2_enum_mbus_code, > - .get_fmt = adv748x_csi2_get_format, > + .get_fmt = v4l2_subdev_get_fmt, > .set_fmt = adv748x_csi2_set_format, > .get_mbus_config = adv748x_csi2_get_mbus_config, > }; > @@ -379,6 +351,11 @@ int adv748x_csi2_init(struct adv748x_state *state, struct adv748x_csi2 *tx) > if (ret) > goto err_cleanup_subdev; > > + tx->sd.state_lock = &state->mutex; > + ret = v4l2_subdev_init_finalize(&tx->sd); > + if (ret) > + goto err_free_ctrl; > + > ret = v4l2_async_register_subdev(&tx->sd); > if (ret) > goto err_free_ctrl; > diff --git a/drivers/media/i2c/adv748x/adv748x.h b/drivers/media/i2c/adv748x/adv748x.h > index d2b5e722e997..9bc0121d0eff 100644 > --- a/drivers/media/i2c/adv748x/adv748x.h > +++ b/drivers/media/i2c/adv748x/adv748x.h > @@ -75,7 +75,6 @@ enum adv748x_csi2_pads { > > struct adv748x_csi2 { > struct adv748x_state *state; > - struct v4l2_mbus_framefmt format; > unsigned int page; > unsigned int port; > unsigned int num_lanes; -- Regards, Laurent Pinchart