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 313192EB11; Thu, 2 May 2024 17:34:39 +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=1714671282; cv=none; b=k3SXHlDmoufcSNDVX6NAKbkGKcDH/XJMgjytlNfAOUEuVbrf5Kq481NoFiUFZN/TrSwvFN+cAsAvs3Y6lg0zdlyjdXmhU9lsSroXlSKzcmQMaCs216OYtIRWBsP0CIMzrZRljbXBpqb7x9OCWv7pEtaWvJ0+qzM/xnO0I82Ih38= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714671282; c=relaxed/simple; bh=L5XbCRqGf2kg74Cc5HWw/gJSLngkaYgH3YD3jIyBfn8=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=Cawz7P5/v9EaOXVULweS73ovkep2mb2czwmwl2MRlj3l3IKkjKacrlgL0MG/Lwr1ROkknrWHdtOiuhVWtUkgp5vqTSDP7lWhiXaYt5AjhUmZde8V2jwUGvyB+FXyL/GrfyjB7zyVvX0/oK0qmqPIugdqFtYcMLB2XasqTwiqmcY= 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=GXSv6XEE; 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="GXSv6XEE" Received: from pendragon.ideasonboard.com (81-175-209-231.bb.dnainternet.fi [81.175.209.231]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 0A44D552; Thu, 2 May 2024 19:33:39 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1714671220; bh=L5XbCRqGf2kg74Cc5HWw/gJSLngkaYgH3YD3jIyBfn8=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=GXSv6XEEZe6teAyk6m0bAD8MZ4EkppXkMIcXdvy0im9RQPpSlcCICptm0urwvRqQC AGWvLv1U2daL3f+LO+LeY35lQXC/LINyJRw8UdKoFK/aqtuQmmfxCbxhjz+HuVgzdQ AZI+2p8XXQlIpsik7CM3QXisbpBf96xlstSDDvl8= Date: Thu, 2 May 2024 20:34:30 +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 01/19] media: adv748x: Add support for active state Message-ID: <20240502173430.GF15807@pendragon.ideasonboard.com> References: <20240430103956.60190-1-jacopo.mondi@ideasonboard.com> <20240430103956.60190-2-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: <20240430103956.60190-2-jacopo.mondi@ideasonboard.com> Hi Jacopo, Thank you for the patch. On Tue, Apr 30, 2024 at 12:39:37PM +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 > --- > drivers/media/i2c/adv748x/adv748x-csi2.c | 69 ++++-------------------- > drivers/media/i2c/adv748x/adv748x.h | 1 - > 2 files changed, 11 insertions(+), 59 deletions(-) > > diff --git a/drivers/media/i2c/adv748x/adv748x-csi2.c b/drivers/media/i2c/adv748x/adv748x-csi2.c > index 5b265b722394..435b0909bbef 100644 > --- a/drivers/media/i2c/adv748x/adv748x-csi2.c > +++ b/drivers/media/i2c/adv748x/adv748x-csi2.c > @@ -139,78 +139,26 @@ static const struct v4l2_subdev_video_ops adv748x_csi2_video_ops = { > * But we must support setting the pad formats for format propagation. > */ > > -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 int adv748x_csi2_set_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; > - int ret = 0; > - > - mbusformat = adv748x_csi2_get_pad_format(sd, sd_state, sdformat->pad, > - sdformat->which); > - if (!mbusformat) > - return -EINVAL; > > - mutex_lock(&state->mutex); > + mbusformat = v4l2_subdev_state_get_format(sd_state, sdformat->pad); > > + /* Format on the source pad is always copied from the sink one. */ > 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; > - } > - > + sink_fmt = v4l2_subdev_state_get_format(sd_state, > + ADV748X_CSI2_SINK); > sdformat->format = *sink_fmt; That's not the right way to do it. You should propagate the format from sink to source when pad == ADV748X_CSI2_SINK, and return adv748x_csi2_get_format() when pad == ADV748X_CSI2_SOURCE. Otherwise setting the format on the sink pad will not update the state of the source pad, and a get format call on the source pad will return an incorrect format. > } > > *mbusformat = sdformat->format; > > -unlock: > - mutex_unlock(&state->mutex); > - > - return ret; > + return 0; > } > > static int adv748x_csi2_get_mbus_config(struct v4l2_subdev *sd, unsigned int pad, > @@ -228,7 +176,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 = { > - .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, > }; > @@ -320,6 +268,11 @@ int adv748x_csi2_init(struct adv748x_state *state, struct adv748x_csi2 *tx) > if (ret) > goto err_cleanup_subdev; > > + tx->sd.state_lock = tx->ctrl_hdl.lock; Maybe that's addressed in subsequent patches, but do we need a device-wide lock ? The code you replace above uses the adv748x_state.mutex lock, which covers all subdevs. I don't think this patch introduces race conditions, so this could possibly be handled on top. > + 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