From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C1289C433ED for ; Sun, 18 Apr 2021 13:24:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8C910610FC for ; Sun, 18 Apr 2021 13:24:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229848AbhDRNZV (ORCPT ); Sun, 18 Apr 2021 09:25:21 -0400 Received: from perceval.ideasonboard.com ([213.167.242.64]:59452 "EHLO perceval.ideasonboard.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229671AbhDRNZV (ORCPT ); Sun, 18 Apr 2021 09:25:21 -0400 Received: from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi [62.78.145.57]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 1FBEB499; Sun, 18 Apr 2021 15:24:52 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1618752292; bh=Zjgp5eTD2ut4yli/YqCuJMeWMcZdSZYKoz4Ht3lspBQ=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=EcU2DgvUysUCMDX7p83oJrzcN0cbYivWRc2pMXUNmTkKn7N6TPm4g9PgfzYDNSuGD HjXDGy0z7bjPX7khNZTYFKreIwroYjmBOrYv4zCsftt/lM6i1UQHCYYFT2KFh40z8c Co8iYJQoOk4oqWg/Lp4JNqmuzFHt9/iQEvcAzcYc= Date: Sun, 18 Apr 2021 16:24:48 +0300 From: Laurent Pinchart To: Tomi Valkeinen Cc: Benoit Parrot , Pratyush Yadav , Lokesh Vutla , linux-media@vger.kernel.org Subject: Re: [PATCH 27/28] media: ti-vpe: cal: remove cal_camerarx->fmtinfo Message-ID: References: <20210412113457.328012-1-tomi.valkeinen@ideasonboard.com> <20210412113457.328012-28-tomi.valkeinen@ideasonboard.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20210412113457.328012-28-tomi.valkeinen@ideasonboard.com> Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Hi Tomi, Thank you for the patch. On Mon, Apr 12, 2021 at 02:34:56PM +0300, Tomi Valkeinen wrote: > struct cal_camerarx has fmtinfo field which is used to point to the > current active input format. The only place where the field is used is > cal_camerarx_get_ext_link_freq(). > > With multiple streams the whole concept of single input format is not > valid anymore, so lets remove the field by looking up the format in > cal_camerarx_get_ext_link_freq(), making it easier to handle the > multistream-case in the following patches. > > Signed-off-by: Tomi Valkeinen > --- > drivers/media/platform/ti-vpe/cal-camerarx.c | 12 ++++++++---- > drivers/media/platform/ti-vpe/cal.h | 1 - > 2 files changed, 8 insertions(+), 5 deletions(-) > > diff --git a/drivers/media/platform/ti-vpe/cal-camerarx.c b/drivers/media/platform/ti-vpe/cal-camerarx.c > index 25f4692d210e..efe6513d69e8 100644 > --- a/drivers/media/platform/ti-vpe/cal-camerarx.c > +++ b/drivers/media/platform/ti-vpe/cal-camerarx.c > @@ -49,8 +49,15 @@ static s64 cal_camerarx_get_ext_link_freq(struct cal_camerarx *phy) > { > struct v4l2_fwnode_bus_mipi_csi2 *mipi_csi2 = &phy->endpoint.bus.mipi_csi2; > u32 num_lanes = mipi_csi2->num_data_lanes; > - u32 bpp = phy->fmtinfo->bpp; > + u32 bpp; > s64 freq; > + const struct cal_format_info *fmtinfo; I'd declare this after num_lanes as I like the reverse xmas tree order. > + > + fmtinfo = cal_format_by_code(phy->formats[CAL_CAMERARX_PAD_SINK].code); > + if (!fmtinfo) > + return -EINVAL; > + > + bpp = fmtinfo->bpp; I wonder if we'll end up dropping this, as falling back to V4L2_CID_PIXEL_RATE in v4l2_get_link_freq() makes less sense when using multiplexed streams. Something to worry about later. Reviewed-by: Laurent Pinchart > > freq = v4l2_get_link_freq(phy->source->ctrl_handler, bpp, 2 * num_lanes); > if (freq < 0) { > @@ -723,9 +730,6 @@ static int cal_camerarx_sd_set_fmt(struct v4l2_subdev *sd, > format->which); > *fmt = format->format; > > - if (format->which == V4L2_SUBDEV_FORMAT_ACTIVE) > - phy->fmtinfo = fmtinfo; > - > return 0; > } > > diff --git a/drivers/media/platform/ti-vpe/cal.h b/drivers/media/platform/ti-vpe/cal.h > index c941d2aec79f..7f35ad5ceac2 100644 > --- a/drivers/media/platform/ti-vpe/cal.h > +++ b/drivers/media/platform/ti-vpe/cal.h > @@ -163,7 +163,6 @@ struct cal_camerarx { > struct v4l2_subdev subdev; > struct media_pad pads[2]; > struct v4l2_mbus_framefmt formats[2]; > - const struct cal_format_info *fmtinfo; > }; > > struct cal_dev { -- Regards, Laurent Pinchart