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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A1D02C433EF for ; Mon, 11 Jul 2022 01:03:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229663AbiGKBDl (ORCPT ); Sun, 10 Jul 2022 21:03:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51270 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229479AbiGKBDk (ORCPT ); Sun, 10 Jul 2022 21:03:40 -0400 Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D515D2DEC for ; Sun, 10 Jul 2022 18:03:38 -0700 (PDT) Received: from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi [62.78.145.57]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 9BA7573E; Mon, 11 Jul 2022 03:03:35 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1657501415; bh=m+XnyEBVlTTfoaq5MYo2XRSIQQHjovO3YGrdNylj8Ng=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=CbTR8j+BgJEV+A9b3JET/zVw4d/hsa+WuDJW7h4qUEMCrjncpd+20lDidoydwfNa+ jC8RIwJzcLSRjaj/ztUwkwGVkIUy2285DfPJio0v26zwMNJjIv2TYZl10r2+bPanX8 NzDuU1IJi2gte66QwxKGLEhotD2nsaUzjgylqa8Y= Date: Mon, 11 Jul 2022 04:03:08 +0300 From: Laurent Pinchart To: Dafna Hirschfeld Cc: linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org, Heiko Stuebner , Helen Koike , Paul Elder Subject: Re: [PATCH v2 38/55] media: rkisp1: isp: Disallow multiple active sources Message-ID: References: <20220630230713.10580-1-laurent.pinchart@ideasonboard.com> <20220630230713.10580-39-laurent.pinchart@ideasonboard.com> <20220711005653.5x2tdcr7nsaq2dfu@guri> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20220711005653.5x2tdcr7nsaq2dfu@guri> Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Hi Dafna, On Mon, Jul 11, 2022 at 03:56:53AM +0300, Dafna Hirschfeld wrote: > On 01.07.2022 02:06, Laurent Pinchart wrote: > >The ISP supports multiple source subdevs, but can only capture from a > >single one at a time. The source is selected through link setup. The > >driver finds the active source in its .s_stream() handler using the > >media_entity_remote_pad() function. This fails to reject invalid > >configurations with multiple active sources. Fix it by using the > >media_entity_remote_source_pad() helper instead, and inline > > you meant media_pad_remote_pad_unique ? Yes, the function name has changed, I'll update the commit message accordingly. > >rkisp1_isp_get_source() in rkisp1_isp_s_stream() as the function is > >small and has a single caller. > > > >Signed-off-by: Laurent Pinchart > >--- > > .../platform/rockchip/rkisp1/rkisp1-isp.c | 30 ++++++++----------- > > 1 file changed, 13 insertions(+), 17 deletions(-) > > > >diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c > >index 37623b73b1d9..d7e2802d11f5 100644 > >--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c > >+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c > >@@ -58,20 +58,6 @@ > > * Helpers > > */ > > > >-static struct v4l2_subdev *rkisp1_isp_get_source(struct v4l2_subdev *sd) > >-{ > >- struct media_pad *local, *remote; > >- struct media_entity *sensor_me; > >- > >- local = &sd->entity.pads[RKISP1_ISP_PAD_SINK_VIDEO]; > >- remote = media_pad_remote_pad_first(local); > >- if (!remote) > >- return NULL; > >- > >- sensor_me = remote->entity; > >- return media_entity_to_v4l2_subdev(sensor_me); > >-} > >- > > static struct v4l2_mbus_framefmt * > > rkisp1_isp_get_pad_fmt(struct rkisp1_isp *isp, > > struct v4l2_subdev_state *sd_state, > >@@ -743,6 +729,8 @@ static int rkisp1_isp_s_stream(struct v4l2_subdev *sd, int enable) > > struct rkisp1_isp *isp = to_rkisp1_isp(sd); > > struct rkisp1_device *rkisp1 = isp->rkisp1; > > const struct rkisp1_sensor_async *asd; > >+ struct media_pad *source_pad; > >+ struct media_pad *sink_pad; > > int ret; > > > > if (!enable) { > >@@ -754,10 +742,18 @@ static int rkisp1_isp_s_stream(struct v4l2_subdev *sd, int enable) > > return 0; > > } > > > >- rkisp1->source = rkisp1_isp_get_source(sd); > >+ sink_pad = &isp->pads[RKISP1_ISP_PAD_SINK_VIDEO]; > >+ source_pad = media_pad_remote_pad_unique(sink_pad); > >+ if (IS_ERR(source_pad)) { > >+ dev_dbg(rkisp1->dev, "Failed to get source for ISP: %ld\n", > >+ PTR_ERR(source_pad)); > >+ return -EPIPE; > >+ } > >+ > >+ rkisp1->source = media_entity_to_v4l2_subdev(source_pad->entity); > > if (!rkisp1->source) { > >- dev_warn(rkisp1->dev, "No link between isp and source\n"); > >- return -ENODEV; > >+ /* This should really not happen, so is not worth a message. */ > >+ return -EPIPE; > > } > > > > asd = container_of(rkisp1->source->asd, struct rkisp1_sensor_async, -- Regards, Laurent Pinchart