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 A09AAE67A9A for ; Tue, 3 Mar 2026 08:43:05 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 01A4C10E66C; Tue, 3 Mar 2026 08:43:05 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ZfS9LHED"; dkim-atps=neutral Received: from mail-lj1-f179.google.com (mail-lj1-f179.google.com [209.85.208.179]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5C0C410E678 for ; Tue, 3 Mar 2026 08:43:00 +0000 (UTC) Received: by mail-lj1-f179.google.com with SMTP id 38308e7fff4ca-389f9895c81so26503931fa.2 for ; Tue, 03 Mar 2026 00:43:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1772527379; x=1773132179; 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=Ggm5W/tKu5AuAHRHgAxgCfaNNqewzCUye92Dt5QC9CU=; b=ZfS9LHEDewqlHOdcBiPxjey3XTzeMdJkOW7GWK1ue88jekSH/oAi+oOoTcfw8+x1OY 6X58xhixWnlMMp6Zv+LxfSHjh8UC2BiXhCmy54mv+ono7gjvcTXl/ePdTT145lrEQOgK /n3ktucJNfnmthjH7ml3H3x6FhZPCMsazK0nZnIOdq70ZV6hGjYJlesXoBf5JeIf6mGR Qvy2CsGEZC1doKvc3ZiiHBA6StOfTbgvxi8weZJBPE8RfDoViYnUYwTCC9W2sj98Jo4g /6XPbIFbVkTqrvntMmVK/B2YgsYcn6eATef1wkpChiIJBmla3+KWgozEkJbpTlCQ1V3O 4JYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772527379; x=1773132179; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=Ggm5W/tKu5AuAHRHgAxgCfaNNqewzCUye92Dt5QC9CU=; b=Qx2Gfuv5bbji3RiiFVrSswfOCDOw91iS2wocoASXFrQOXJK7umRmeEndGO9xDVj6TX 9L1UsUb51A6N3Dy4itaD7EDuMASq8DoeJJyPiWDNpLYWjx3u1rJcuS5/6T0N8nXzKRnG KemQs6I1Vn9EUiC9fkPhoo/l10eEQH0L0FoQiNhaBmsf2f/C+GpsA0I3Yv3V5lwxjae1 wN55rro6d+o4ucW/rsmGOrEAAoxEOuJp0e8PzQzuQaDhwiNRBcrIEFfSTfGAYDLLpmlY F4WEcBzIjcYjiVKCaAZvLgOQCrCHqqHeNfbofYmLhGNu8Q+ZkFJC1COa5LMr7c5mpg/y 6Zrw== X-Forwarded-Encrypted: i=1; AJvYcCWtY0dkHn1M3QfoEHY5eNc8SoK9mJ6B6QsY/rWNdZLldpKb13mIiHA9FynE/pAoW9ZgmNLYuqRLbio=@lists.freedesktop.org X-Gm-Message-State: AOJu0YwA6VW2CT70C63rgpGTTY2yTMBG2WuHme9CSDBMMYU5zDxPh1Xu OBCzTSptL5zSjPsHrFsMipdRhLIMfOgWJbxUN/MvS7tcHwYGrT7G6slp X-Gm-Gg: ATEYQzzeIUQ3Sm1F9hCdvxPMfj0AmXhPdon+jK1rytuGv6kgAr2IBrcVxi+b2KU7nzW XNsbKSsxbXN1lM5OFMxS6n91YDfzayrNu81Bt2o4bCvptychJq6ec+Zho4hko1HD58qNXYxtwT3 A49PvvghD+qWi8xA9e8nDywNxhhUi03FUDg2140PxNEXuZx1IdypIyDyNpM31ZVLmDClUhbuc+P P/To2GKvAdY6TrBnpJocZyA4Bk6aaseEYxWTTZx20Zgu4KgxoNXEaJoFEmZMzjWhGQOGOwMwGOb 5Yosb2prJbNKJJEQZcDbbbNK0R+CfkV1RejQD6gOSqxbZGa4/TAeHyw0SbNOWzzTIvUGXmjsdvU tWuU2Hzu+ZyqRaY9DDMzjhfG6cvXHXEzEsFVRFaMnRVzYgLWY0gKfSQKaeGiw1d3ofaqcfEFzWV gfqfoxTK92sLOVGh55c7FL2us= X-Received: by 2002:a2e:9246:0:b0:383:7f85:8eef with SMTP id 38308e7fff4ca-389ff356ffbmr81095711fa.29.1772527378501; Tue, 03 Mar 2026 00:42:58 -0800 (PST) Received: from xeon ([188.163.112.72]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-389f30227a9sm32599471fa.42.2026.03.03.00.42.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Mar 2026 00:42:58 -0800 (PST) From: Svyatoslav Ryhel To: Thierry Reding , Thierry Reding , Mikko Perttunen , David Airlie , Simona Vetter , Jonathan Hunter , Sowjanya Komatineni , Luca Ceresoli , Mauro Carvalho Chehab , Greg Kroah-Hartman , Hans Verkuil , Svyatoslav Ryhel Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-tegra@vger.kernel.org, linux-media@vger.kernel.org, linux-staging@lists.linux.dev Subject: [PATCH v7 06/15] staging: media: tegra-video: vi: improve logic of source requesting Date: Tue, 3 Mar 2026 10:42:29 +0200 Message-ID: <20260303084239.15007-7-clamor95@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260303084239.15007-1-clamor95@gmail.com> References: <20260303084239.15007-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. Tested-by: Luca Ceresoli # tegra20, parallel camera 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 bcaea20c3025..92078a1f9a4e 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 19eebfdae221..7032c733577d 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; @@ -1631,11 +1631,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.51.0