From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 34BA937F8A2 for ; Fri, 30 Jan 2026 12:50:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.54 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769777405; cv=none; b=gDyGFnqpERfVAzkQFnJy02pXWDoWrrsspYgNcCosEhnO8kJXE9v7jgLO3jEd2NYO13xSfgu9x9DTreKtmpqXoYYEVJKxD/MUeDtEDyE8Nz7ARBBHXG+EzXHLo2W9A2OOakvgWAnEPZN80NhPbufk+Qy4IJDBPCUoJWowzNfN5RI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769777405; c=relaxed/simple; bh=NP5wyq347Z6v9T3ICeLdnanOcnkIKeVAP2h+kcM9y4U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fDeWLT4FXh0izMCjm0xsaoToBOts4IOOblVeSbFkwyPMC2Db70o0XDZxpI4iVkwA0zvTpajaUTIZLKofKRh7hXWDtQ950PgC/dEY69gNB65LqTgiEAWw6V2gzPg9Q7yxjwMYttiqeiNTUhALU6turXGSyaFfi8PuSmRDZ/Hitcs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=aHepDAh0; arc=none smtp.client-ip=209.85.221.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="aHepDAh0" Received: by mail-wr1-f54.google.com with SMTP id ffacd0b85a97d-435903c4040so1435080f8f.3 for ; Fri, 30 Jan 2026 04:50:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1769777401; x=1770382201; darn=lists.linux.dev; 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=s+nXxOTMIADfvgUw9tigLc0fwuFzoK09epjwvFZ7lj8=; b=aHepDAh0/Af5dOC+yG5eCaLLIIfm+YIzyZfG9wSBtGAFXPiE5kSv1xsZR5ur3Yv0A1 M1Az1/YNU9nKxF44669jy4Un8akjltbelvzeXY50D78A5JAyO2st/Sf3VBrP/0D1LvTT gLTaSpPtqYRuqZuAIYPPy4F5gWo0/kwHpH4Q3WCERAkCOC3CzhXqbkmEi3AhO1N612AT E6CB54Vu5zAqE+jTAH9ug7yHnREa/y2H07uIQl3dojSjMbzBsvrAg9qVvpQ1mFzy+G2o NsjM/aES2neB7p/a7OeOKd4xHVmc51IhhNwvRpfJlblt8Ce/eMeIc+g/dicRCoROaieW KX2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769777401; x=1770382201; 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=s+nXxOTMIADfvgUw9tigLc0fwuFzoK09epjwvFZ7lj8=; b=tQ4sb87u4rFVGuklrrHzEihHHkI/y/Hm2IezN3UWzB1LhU+v9ov8CA1l0dqq54YVVJ nCrJ2XCqB2LYPqxxTYazrO+c3LloDBtisH2ZEjcLAgwd6+79ImpYHgiV3pueFjwgIHh1 YF6P1njDT0RO1HtcTQv1b51bfjjeoDuSAx3fbR9ukTOuvbCIFh01o8Pd/EFfZa7KXLgb n1gp/YKLdawl54yleSiPqUwiPMLUOqdlTaOzHthzHfdSkSdL3aPNNupNwDtpGWwekPlF tMrzP4Er/ftfNrXIL4pYiNeI0KwbRaUR3Oic1K93FAY6DX3k5sup+4Hp6qk9+kJqgy2z xpUw== X-Forwarded-Encrypted: i=1; AJvYcCVoJF/qmYJcf0R9xNS1NUqV7BUdPxEZ4Orw7a7Lqe8LvRs239FMRCWLfN2uvEPCuKb7KsCqwRUtvUscKdet@lists.linux.dev X-Gm-Message-State: AOJu0Yz0fhTMRAbbyppN2GboFIHF3pVGFwdV7Uq21FsXikbGRLjbUY/0 3PDAHYse1H91PRKOxqrkvwTkrLDBQtDeH+h9O/ApiA1UVHa8JRjOrMBj X-Gm-Gg: AZuq6aLqTg7nrojIN7rnhpAs6cNVN779zZbN1rgNzItBARVRMNdR+NxG5JuPduw26bk Qxngd/ugpV/Kqci+xPTJe1TuJXUv2nfAjl+Dd4aQNAfq1av4f7WBe8bMY1S1rNqN4JvWE01i5es CuLxaUdeXD73Bs6f4+lKsZR3iAbshCKx5H25cxm+y1KUsVYGcXu7NPJkiw9fcuucB5ZZzwezWci xsFthm+3Mvku/rJmDRN+OvIE2npIdBLndPY1d4G/o1YiZgzO0XbxgpLxR2sDwF0T3x9Ox+Y9Dha xSKE4EoLATbkX0lsZj1DA6G5faUcVCJ3pGtG3o/r26Dep1WhFFDgUKPbxduFnQcB1nA4yxfyQa5 PyhwZTvraesKblzN3e3U3meXTg1xDwAKWRzglXGXfHSFv1ko6IHa+2tZP+/CIEj7lM9hzDlljn0 lD X-Received: by 2002:a05:6000:400e:b0:42f:f627:3a8c with SMTP id ffacd0b85a97d-435f3a7a015mr3476820f8f.7.1769777401172; Fri, 30 Jan 2026 04:50:01 -0800 (PST) Received: from xeon ([188.163.112.49]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-435e10e4757sm22738783f8f.5.2026.01.30.04.50.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Jan 2026 04:50:00 -0800 (PST) From: Svyatoslav Ryhel To: 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 v6 06/15] staging: media: tegra-video: vi: improve logic of source requesting Date: Fri, 30 Jan 2026 14:49:23 +0200 Message-ID: <20260130124932.351328-7-clamor95@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260130124932.351328-1-clamor95@gmail.com> References: <20260130124932.351328-1-clamor95@gmail.com> Precedence: bulk X-Mailing-List: linux-staging@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 9fdc8ac1c754..38bff499a8e0 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 0f98157a7e91..f0725312e236 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