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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A141DCCD185 for ; Wed, 8 Oct 2025 07:31:37 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0AEE510E76C; Wed, 8 Oct 2025 07:31:37 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="VKgMPtCN"; dkim-atps=neutral Received: from mail-lf1-f45.google.com (mail-lf1-f45.google.com [209.85.167.45]) by gabe.freedesktop.org (Postfix) with ESMTPS id B1C8210E768 for ; Wed, 8 Oct 2025 07:31:35 +0000 (UTC) Received: by mail-lf1-f45.google.com with SMTP id 2adb3069b0e04-57992ba129eso8154096e87.3 for ; Wed, 08 Oct 2025 00:31:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1759908694; x=1760513494; darn=lists.freedesktop.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=GxcQ3SZL/bX2w7ws13Plp9aplxV6uyygzePW373+H0o=; b=VKgMPtCN3l6S9Yb3yA1Pt9k4+4hSt8QgrbFS0SI4QvbMvdCmafB/92L+HgmtaVLdIp 65GpJJ6mgL+23LNnm+10lW776rPVtoMwjWl938O+yYBAjTanSdJl+q2s9zSTD2uwq/uY TY1jkg196J9AlPt1jbdMVcHgSbSjs3qHI/ZUvH8Z2qHsiL2i3rHU3H5LuJPNaWCgHtKC gJCInLyaHD9sW/mAQz9ES0qoektaSu5mLRa/CW2P1WRrz9CqWrvZmxtp83pRPEXCSbeO VWd1uUf9CjMVcrFM22T3/jTe/kPdyp6FinE4g9ZiuG4Ij1LFQ3vOoGpST+27gCOjqnTY Lr6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759908694; x=1760513494; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GxcQ3SZL/bX2w7ws13Plp9aplxV6uyygzePW373+H0o=; b=Mp7tss8bYuZsi50ivwo2qCnyhaOKdF5KEj+eGxkn+1iVzfLqx9vpRpuuZsraEHR/3P duMyabWIcnCPbCXhrnDu55LMc+lkCcuFNs/+8U24sJXdjWXH6SSWVOxKk7bR6oUetOHv 0iE3wvWY0HtZFFVvpjYxGADv16C3eqoB6OHF5+2ox/Kb4/yRpWfTpc7FUvQU9rBG4rec LZI9dlClpdIV7VLhyQh0VPLdpNLrWphkOyWVWxvHdIsoRmieTrnh1E8YkDf6n5gM3b8J X12JHOemJdlhc+OOS2touO/28DzcaEWBL0/durcd1nGxhmHBx1II/zlgOozJb44twjr2 t6OQ== X-Gm-Message-State: AOJu0Yy30hP2YcTYkY0sCsQtyIO84FwWveyEpFD39Nm2YTFGsZPueznT gWQg5ZH2kjnV726v4cfRiqeq3tNL75m+9EzEGViSNBJ4uThbF8C7YkA4 X-Gm-Gg: ASbGncvYIIGiPKRVRzaAaZFGE+6Obq5+eX93phVEh62I36trpDyWU6MHloYzJV+mF7n Mf703J/m2PgGcitvKIdCRhK6VOQ2HK+ozFkLiokfNgAcUhww7bqXSp1ActX8iXZSY69lxvRerVw NEZSCsEBp4yzMQi+LLM7Sy6vrPV1NSdSeCjpsOZNLVYqGRe6zOnsfGV7u+KtCAnmq3vX90CvpA7 fYt3TcxWhU4aPyFeQYomR44YgKyNq8JVS1Y5oZvBpYN1ShvKf1RFFH74GMT0zhuOX6ekAThDNKC 9BP9Nq3GEctTcQGBtfrOSQ+tIKN8FwzP4P3JNOnI1W99t5lN8jdDvrKdO3MGiYRIthGebxA+w0j uId8MFHs+K2D5AON9TJ0uE3vb0wuV8tckju+3hA== X-Google-Smtp-Source: AGHT+IHCy3e0qspIz9xOBUfl4DFzrhgYH1uWX/O9LZQV10EfDxDXgWG4DqQUX5eJig20VQVw/qTisQ== X-Received: by 2002:a05:6512:33c8:b0:579:6de0:983b with SMTP id 2adb3069b0e04-5906dc2a41dmr787981e87.17.1759908693893; Wed, 08 Oct 2025 00:31:33 -0700 (PDT) Received: from xeon.. ([188.163.112.70]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-58b0118d22bsm6911016e87.85.2025.10.08.00.31.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Oct 2025 00:31:33 -0700 (PDT) From: Svyatoslav Ryhel To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Thierry Reding , Jonathan Hunter , Sowjanya Komatineni , Luca Ceresoli , Prashant Gaikwad , Michael Turquette , Stephen Boyd , Mikko Perttunen , Linus Walleij , Mauro Carvalho Chehab , Greg Kroah-Hartman , Svyatoslav Ryhel , =?UTF-8?q?Jonas=20Schw=C3=B6bel?= , Dmitry Osipenko , Charan Pedumuru , Diogo Ivo , Aaron Kling , Arnd Bergmann Cc: dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-clk@vger.kernel.org, linux-gpio@vger.kernel.org, linux-staging@lists.linux.dev Subject: [PATCH v4 12/24] staging: media: tegra-video: vi: improve logic of source requesting Date: Wed, 8 Oct 2025 10:30:34 +0300 Message-ID: <20251008073046.23231-13-clamor95@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20251008073046.23231-1-clamor95@gmail.com> References: <20251008073046.23231-1-clamor95@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" By default tegra_channel_get_remote_csi_subdev returns next device in pipe assuming it is CSI but in case of Tegra20 and Tegra30 it can also be VIP or even HOST. Define tegra_channel_get_remote_csi_subdev within CSI and add check if returned device is actually CSI by comparing subdevice operations. Previous tegra_channel_get_remote_csi_subdev definition in VI rename to tegra_channel_get_remote_bridge_subdev and use it only in VI driver since core VI driver does not care about source and does not call any specific functions. Signed-off-by: Svyatoslav Ryhel --- drivers/staging/media/tegra-video/csi.c | 16 ++++++++++++++++ drivers/staging/media/tegra-video/vi.c | 14 +++++++------- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/drivers/staging/media/tegra-video/csi.c b/drivers/staging/media/tegra-video/csi.c index 9e3bd6109781..ef5f054b6d49 100644 --- a/drivers/staging/media/tegra-video/csi.c +++ b/drivers/staging/media/tegra-video/csi.c @@ -445,6 +445,22 @@ static const struct v4l2_subdev_ops tegra_csi_ops = { .pad = &tegra_csi_pad_ops, }; +struct v4l2_subdev *tegra_channel_get_remote_csi_subdev(struct tegra_vi_channel *chan) +{ + struct media_pad *pad; + struct v4l2_subdev *subdev; + + pad = media_pad_remote_pad_first(&chan->pad); + if (!pad) + return NULL; + + subdev = media_entity_to_v4l2_subdev(pad->entity); + if (!subdev) + return NULL; + + return subdev->ops == &tegra_csi_ops ? subdev : NULL; +} + static int tegra_csi_channel_alloc(struct tegra_csi *csi, struct device_node *node, unsigned int port_num, unsigned int lanes, diff --git a/drivers/staging/media/tegra-video/vi.c b/drivers/staging/media/tegra-video/vi.c index 90473729b546..04b538e8b514 100644 --- a/drivers/staging/media/tegra-video/vi.c +++ b/drivers/staging/media/tegra-video/vi.c @@ -160,8 +160,8 @@ static void tegra_channel_buffer_queue(struct vb2_buffer *vb) wake_up_interruptible(&chan->start_wait); } -struct v4l2_subdev * -tegra_channel_get_remote_csi_subdev(struct tegra_vi_channel *chan) +static struct v4l2_subdev * +tegra_channel_get_remote_bridge_subdev(struct tegra_vi_channel *chan) { struct media_pad *pad; @@ -182,7 +182,7 @@ tegra_channel_get_remote_source_subdev(struct tegra_vi_channel *chan) struct v4l2_subdev *subdev; struct media_entity *entity; - subdev = tegra_channel_get_remote_csi_subdev(chan); + subdev = tegra_channel_get_remote_bridge_subdev(chan); if (!subdev) return NULL; @@ -204,7 +204,7 @@ static int tegra_channel_enable_stream(struct tegra_vi_channel *chan) struct v4l2_subdev *subdev; int ret; - subdev = tegra_channel_get_remote_csi_subdev(chan); + subdev = tegra_channel_get_remote_bridge_subdev(chan); ret = v4l2_subdev_call(subdev, video, s_stream, true); if (ret < 0 && ret != -ENOIOCTLCMD) return ret; @@ -217,7 +217,7 @@ static int tegra_channel_disable_stream(struct tegra_vi_channel *chan) struct v4l2_subdev *subdev; int ret; - subdev = tegra_channel_get_remote_csi_subdev(chan); + subdev = tegra_channel_get_remote_bridge_subdev(chan); ret = v4l2_subdev_call(subdev, video, s_stream, false); if (ret < 0 && ret != -ENOIOCTLCMD) return ret; @@ -1630,11 +1630,11 @@ static int tegra_vi_graph_notify_complete(struct v4l2_async_notifier *notifier) goto unregister_video; } - subdev = tegra_channel_get_remote_csi_subdev(chan); + subdev = tegra_channel_get_remote_bridge_subdev(chan); if (!subdev) { ret = -ENODEV; dev_err(vi->dev, - "failed to get remote csi subdev: %d\n", ret); + "failed to get remote bridge subdev: %d\n", ret); goto unregister_video; } -- 2.48.1