From patchwork Wed Feb 19 19:11:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cosmin Tanislav X-Patchwork-Id: 13982731 Received: from mail-ej1-f44.google.com (mail-ej1-f44.google.com [209.85.218.44]) (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 8EE7D21B180 for ; Wed, 19 Feb 2025 19:11:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739992309; cv=none; b=sby8vuNqb+zct9IfO5WmVLhIAJkYG9G5/bLVnJLqsGMowGWV0IpdaFPbtEDsSKrg21RHPTEln6G+3df0B6CogT/6uTfMmql+PP9W9B+9KMQdfG3UAR601ANLak8Y66We6i81BFIzcNW82d3jQHCXPJWLuXnh7pFjRkRtnBrNfJk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739992309; c=relaxed/simple; bh=CxD10gBKhnBlBboDKHEiIi7FSS2bsuepkGgdDzeKRqI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=d9Ps7G0+z7TFKbDdoQkBILXdXxbFvjh31V4XkiaSXsNT58pLD86lM1Nn8bfuC0AFHP3C1FmRLH34HfDXLop9nBcX5AL8VeJwT3E3JT7ePOQRDx0ZM+vAqnWbTPLDx+tAh4M1kYngVm6DJA4h6dojRWVIrLU+gBtaZM5i6atdiT8= 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=UYI4pZTZ; arc=none smtp.client-ip=209.85.218.44 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="UYI4pZTZ" Received: by mail-ej1-f44.google.com with SMTP id a640c23a62f3a-abb9709b5b5so31191066b.2 for ; Wed, 19 Feb 2025 11:11:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739992306; x=1740597106; 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=a262ZEBhq3D29Ca0JPQXcyDvoWYFO8pQujf9qH9htLg=; b=UYI4pZTZ63G//oPzLX56Vqar+4AFIbWrG1IwOaMXmRanbT8lx577BIR6hLoOCSpcP6 cySwdaffWxK/j6n/fkSQfF+rqYAxz/HxV7VrgGpuIDcHAEDy1RCH5sEgy0SA+MEYsa5W 0VrLtqsuBC+5d43iRmFhqSbapYLLWtXL4ESur7x4wHpgfJZ/dUShOODfGrQQ0CHN70XV dKigaJxhbgsYcEI2KpfbECeY5JbQO18+i72A4YmG18itGyYuGhthbfsSU76C3JeUhJtl jzxfb7CR1wexe3bARzdTHZ4JFAvjPHQf4jbBFt4//8BrdB9DOQW9m1+L72ACNW5hO15h IdzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739992306; x=1740597106; 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=a262ZEBhq3D29Ca0JPQXcyDvoWYFO8pQujf9qH9htLg=; b=FSkXlQDxgupGhwM9nreZW4E8UCY1r3xgEGFdq06ziHFMRHtHf5evXSyGYerNe5eWzv zDF3Yplzcy+gDIgX0YxnHPPkwjv8/cbJjsCkoUZP4E/lfnU88LnSGAtaDyAyEX8o1rex w/WPC8Z7GUM2mv/OJiEfabE5Y2mKjIK7V10gt5Bt1DZstuH51Br9HJoPatenKi1IVRRC fJoXtxb9tlhInwh2andseQoF1LoFNjmjkOE+YvNeoJ2hMUhB/XCeLOkvhazcF7WbNMiG t1TDIubG/pdKp+piMbRfXEQOrwh4vFbOq+bFRWtiwJVq9dIp33W1aZAs4ift/pc1tHUB oV4Q== X-Forwarded-Encrypted: i=1; AJvYcCXaW9HYJT2elcyEcPHtHXjLqvoYI/UDFPmEwBvuEnubPFS07uOiw0twQQdGJ9ZCj7OWdWM=@lists.linux.dev X-Gm-Message-State: AOJu0Yw98Y689mYAgzs+vh+QxU2QA/CTacE04UViWRizqN4/8SsBBOH3 dE4g5dRfob4C/uad7w4G5IpYCkIKys2lGf0AjOAC25YRJxi0kSzG X-Gm-Gg: ASbGncsWIq1UlSqds7MiEa3rXGAydDlKdSYGWOUPTSrMset1PbCq+B78xshye9kSQqK OdO6CJN+0joaz4w0W0QbEB+mmyXCOrQRTypkLXFbxVev0qYBOw7XURFlfZXxNhitzoxTSNKFMvY drayB+PNhweONwi6G0gbTv33pMcZnCUcMYqtTcuKgF0h75AIZsjXTEVIVDbVkhFnWaUYI21Tjls uAv7PK/qvdXjwctwaMkU6KenGOhaTlH46X9l7FwAuBZOoND2TM/ELMABXiXgLXjIxR4ryac2LPG ZHu2H5+MT0LdhMLtDr9HVCyj35SH X-Google-Smtp-Source: AGHT+IGt33FKjogW2MeCmEg4l06p7Iw7k+Kx5sL28n3odtsZTl47FrANkRpgYS+18doFVosGl8reHA== X-Received: by 2002:a17:907:2da0:b0:ab7:e47c:b54a with SMTP id a640c23a62f3a-abb71159ef2mr2192693566b.37.1739992305822; Wed, 19 Feb 2025 11:11:45 -0800 (PST) Received: from demon-pc.localdomain ([188.27.130.21]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-abbe0d39f9csm127767866b.69.2025.02.19.11.11.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Feb 2025 11:11:45 -0800 (PST) From: Cosmin Tanislav To: Cc: Tomi Valkeinen , Mauro Carvalho Chehab , Julien Massot , Sakari Ailus , Bingbu Cao , Tianshu Qiu , Laurent Pinchart , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , Hans Verkuil , Umang Jain , Cosmin Tanislav , =?utf-8?q?Pawe=C5=82_Anikiel?= , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org Subject: [PATCH 1/3] media: v4l: subdev: add v4l2_subdev_routing_xlate_streams() Date: Wed, 19 Feb 2025 21:11:30 +0200 Message-ID: <20250219191136.215151-2-demonsingur@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250219191136.215151-1-demonsingur@gmail.com> References: <20250219191136.215151-1-demonsingur@gmail.com> Precedence: bulk X-Mailing-List: imx@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Currently, the v4l2_subdev_state_xlate_streams() function is used to translate streams from one pad to another. This function takes the entire subdev state as argument, but only makes use of the routing. Introduce a v4l2_subdev_routing_xlate_streams() function which can be used without the entire subdev state, to avoid passing the entire state around when not needed. Signed-off-by: Cosmin Tanislav --- drivers/media/v4l2-core/v4l2-subdev.c | 12 +++++++++--- include/media/v4l2-subdev.h | 18 ++++++++++++++++-- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/drivers/media/v4l2-core/v4l2-subdev.c b/drivers/media/v4l2-core/v4l2-subdev.c index cde1774c9098d..d1581f1036487 100644 --- a/drivers/media/v4l2-core/v4l2-subdev.c +++ b/drivers/media/v4l2-core/v4l2-subdev.c @@ -2042,10 +2042,9 @@ v4l2_subdev_state_get_opposite_stream_format(struct v4l2_subdev_state *state, } EXPORT_SYMBOL_GPL(v4l2_subdev_state_get_opposite_stream_format); -u64 v4l2_subdev_state_xlate_streams(const struct v4l2_subdev_state *state, - u32 pad0, u32 pad1, u64 *streams) +u64 v4l2_subdev_routing_xlate_streams(const struct v4l2_subdev_krouting *routing, + u32 pad0, u32 pad1, u64 *streams) { - const struct v4l2_subdev_krouting *routing = &state->routing; struct v4l2_subdev_route *route; u64 streams0 = 0; u64 streams1 = 0; @@ -2066,6 +2065,13 @@ u64 v4l2_subdev_state_xlate_streams(const struct v4l2_subdev_state *state, *streams = streams0; return streams1; } +EXPORT_SYMBOL_GPL(v4l2_subdev_routing_xlate_streams); + +u64 v4l2_subdev_state_xlate_streams(const struct v4l2_subdev_state *state, + u32 pad0, u32 pad1, u64 *streams) +{ + return v4l2_subdev_routing_xlate_streams(&state->routing, pad0, pad1, streams); +} EXPORT_SYMBOL_GPL(v4l2_subdev_state_xlate_streams); int v4l2_subdev_routing_validate(struct v4l2_subdev *sd, diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h index 2f2200875b038..90d08e13e016b 100644 --- a/include/media/v4l2-subdev.h +++ b/include/media/v4l2-subdev.h @@ -1582,9 +1582,9 @@ v4l2_subdev_state_get_opposite_stream_format(struct v4l2_subdev_state *state, u32 pad, u32 stream); /** - * v4l2_subdev_state_xlate_streams() - Translate streams from one pad to another + * v4l2_subdev_routing_xlate_streams() - Translate streams from one pad to another * - * @state: Subdevice state + * @state: Routing used to translate streams from one pad to another * @pad0: The first pad * @pad1: The second pad * @streams: Streams bitmask on the first pad @@ -1601,6 +1601,20 @@ v4l2_subdev_state_get_opposite_stream_format(struct v4l2_subdev_state *state, * * Return: The bitmask of streams of @pad1 that are routed to @streams on @pad0. */ +u64 v4l2_subdev_routing_xlate_streams(const struct v4l2_subdev_krouting *routing, + u32 pad0, u32 pad1, u64 *streams); + +/** + * v4l2_subdev_state_xlate_streams() - Translate streams from one pad to another + * + * @state: Subdevice state + * @pad0: The first pad + * @pad1: The second pad + * @streams: Streams bitmask on the first pad + * + * This is the same as v4l2_subdev_routing_xlate_streams, but takes subdevice + * state as parameter + */ u64 v4l2_subdev_state_xlate_streams(const struct v4l2_subdev_state *state, u32 pad0, u32 pad1, u64 *streams); From patchwork Wed Feb 19 19:11:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cosmin Tanislav X-Patchwork-Id: 13982732 Received: from mail-ej1-f51.google.com (mail-ej1-f51.google.com [209.85.218.51]) (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 2044521ADAB for ; Wed, 19 Feb 2025 19:11:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739992317; cv=none; b=B47swkgz6CEe/MbR+B7KL0Vf7gwHbgIKdDf9LPO79I1XKdiRUddp3lIeELUwDO766seqIW+EzDX10KhyziAUcoHCzDhZBgGFVIvJdVqNCZu+UuskhdPnaN6JpBTWt7Uf5NSDtAOdFiBL16ThGB437OPiJO/aE5k8embYlGUkeq8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739992317; c=relaxed/simple; bh=jmA5+mv7y4YYnczHfeTR7YA2lkIzoroaa+RiRkCmeVM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mMLGPFoTJoEoHPtwV4HSlSvd0a7eS6hxxgFV8RfC2ccPymcBqJckkpJzkLwi315Kv0SNM98eCSxlKH56+0OkEuuFEpiPCaSoXPBrsCljmZ9vRkeut23TTxPNem8Uvu8+lNVvbWYBQs5njPJjR+guTbmv1trdLPRLb3ZZzDOSqWc= 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=G37noaPG; arc=none smtp.client-ip=209.85.218.51 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="G37noaPG" Received: by mail-ej1-f51.google.com with SMTP id a640c23a62f3a-abb90f68f8cso32406766b.3 for ; Wed, 19 Feb 2025 11:11:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739992313; x=1740597113; 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=TeWqo1HnQdE3Xew6TBWIe5frodF2RFwVLBqIU5l9vVU=; b=G37noaPGXXBXG/HzYM7r9nF1G26+W6zZ6qXxkpi38ZsGTwDeQ4M7ORQV65Ta7N8cM6 SazTcpDIRxDkAjX58Etco1WB+qIcKUzRW3AiuB4RmALd7DGM6VCq6geHL1q+MFzWMHDz LhO7FSkC+8Xyixzm3m0nvAG/zfr++RAW9cZ/ThJqLRIMFHNzRa4yN3jXyedPwilANW2Z WfgVA1ht5/M3JnRqwkiAm++WykvNzsNHwOM59FbOEADuMbjGu2gPyWPDG5GKYuQemsj+ c5Gz4TnTdqe784qNH2pLvNCBXYmVqKO15PNpyxJjGwAkHEk9Iib4vEifr0HW8ps4cW5L nQmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739992313; x=1740597113; 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=TeWqo1HnQdE3Xew6TBWIe5frodF2RFwVLBqIU5l9vVU=; b=C1oeMHmAxelpuf9eX7fdVD/qzbGVrx6fg0zc4X3IpxokSfwhI6qL1bAFwgQPkir1RT KvSoPgpe5CGbKMETTF8Xco3Y3WYb0dxVKGZMCWNvpT2p/0xdkgUL1a2iZfylDzUC4Dzv p2qexTR2YPmv3IDFflUaLnxpwuIfcavvRnQO9d6ZvvryM832XdPxhJdS9Wxeyxa5Tvhx dUUAbxECDD/SvkHNJdCKeqaRBTFxkG5Q3eB2oX131v+td2d2GQSYjvYSvrNekbZO+z6V H1PpuN403b1wwx2XJsz8vV2ohXvWMNtvfTZxvtgO2+7UdIm1fPOT1Lbib+QqEN2vJ7dv uq2A== X-Forwarded-Encrypted: i=1; AJvYcCURmp6ryiC5UUj6BfqVngTrDbHiyRYzfbsjRX1SdvEM40LSe6kRnXXgGeIw8kBOwLiCRA4=@lists.linux.dev X-Gm-Message-State: AOJu0YwnhEn5wB8B7NgFUQFpskHV2/CtmjHJ61uJXEI4cvLmFZpGynT2 YMascBINQDGV3RpT/uE22X41hL5w2Zttx6RqXnMIV6FxRBj+UkU7 X-Gm-Gg: ASbGncuCIv+pwpbBGwHoHocNqKE5SjT+b6WcJwJQr0q6E1GwP9flIy83I29pUn4s37g PJbZDSmYq1mMbOPSxLHvyJi8omcHcPKUFCsYShADxPjpyNEqs4TBFnbM/k6fGKWKoLKFozjoRMM 0Sfr9DeL03vyO2qfMzUklw+oo6W4w8OUqX29FEYjGEUtOXEEvEI4spTXTrIrF4SHjzvodbbr6/i n1jRXw823p6pTincWUUcgMWo8PwOGNbFWyullsIgYKl1Iyljh4VxULhO3ARyBWpBY3fornzvzRN JD+KinLLKSoyX8L5DoCDGivAQkoX X-Google-Smtp-Source: AGHT+IEIElAhIncM7Zr/Vqckj3vDoXiYUCL9ogHbzv7UIans32TGHh2oeqc5N+BExx1k+LESN0G7ig== X-Received: by 2002:a17:906:315b:b0:ab7:d179:249a with SMTP id a640c23a62f3a-abb70b1e782mr1529786166b.15.1739992313056; Wed, 19 Feb 2025 11:11:53 -0800 (PST) Received: from demon-pc.localdomain ([188.27.130.21]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-abbe0d39f9csm127767866b.69.2025.02.19.11.11.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Feb 2025 11:11:52 -0800 (PST) From: Cosmin Tanislav To: Cc: Tomi Valkeinen , Mauro Carvalho Chehab , Julien Massot , Sakari Ailus , Bingbu Cao , Tianshu Qiu , Laurent Pinchart , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , Hans Verkuil , Umang Jain , Cosmin Tanislav , =?utf-8?q?Pawe=C5=82_Anikiel?= , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org Subject: [PATCH 2/3] media: use v4l2_subdev_routing_xlate_streams() Date: Wed, 19 Feb 2025 21:11:31 +0200 Message-ID: <20250219191136.215151-3-demonsingur@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250219191136.215151-1-demonsingur@gmail.com> References: <20250219191136.215151-1-demonsingur@gmail.com> Precedence: bulk X-Mailing-List: imx@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Replace current usages of v4l2_subdev_state_xlate_streams() with v4l2_subdev_routing_xlate_streams() in preperations for the removal of v4l2_subdev_state_xlate_streams(). Signed-off-by: Cosmin Tanislav --- drivers/media/i2c/ds90ub913.c | 14 ++++++----- drivers/media/i2c/ds90ub953.c | 14 ++++++----- drivers/media/i2c/max96714.c | 16 ++++++------- drivers/media/i2c/max96717.c | 23 ++++++++++--------- drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c | 14 ++++++----- .../platform/nxp/imx8-isi/imx8-isi-crossbar.c | 2 +- 6 files changed, 45 insertions(+), 38 deletions(-) diff --git a/drivers/media/i2c/ds90ub913.c b/drivers/media/i2c/ds90ub913.c index fd2d2d5272bfb..b8dfcf730baa2 100644 --- a/drivers/media/i2c/ds90ub913.c +++ b/drivers/media/i2c/ds90ub913.c @@ -252,9 +252,10 @@ static int ub913_enable_streams(struct v4l2_subdev *sd, u64 sink_streams; int ret; - sink_streams = v4l2_subdev_state_xlate_streams(state, UB913_PAD_SOURCE, - UB913_PAD_SINK, - &streams_mask); + sink_streams = v4l2_subdev_routing_xlate_streams(&state->routing, + UB913_PAD_SOURCE, + UB913_PAD_SINK, + &streams_mask); ret = v4l2_subdev_enable_streams(priv->source_sd, priv->source_sd_pad, sink_streams); @@ -274,9 +275,10 @@ static int ub913_disable_streams(struct v4l2_subdev *sd, u64 sink_streams; int ret; - sink_streams = v4l2_subdev_state_xlate_streams(state, UB913_PAD_SOURCE, - UB913_PAD_SINK, - &streams_mask); + sink_streams = v4l2_subdev_routing_xlate_streams(&state->routing, + UB913_PAD_SOURCE, + UB913_PAD_SINK, + &streams_mask); ret = v4l2_subdev_disable_streams(priv->source_sd, priv->source_sd_pad, sink_streams); diff --git a/drivers/media/i2c/ds90ub953.c b/drivers/media/i2c/ds90ub953.c index 46569381b332d..c239ede968423 100644 --- a/drivers/media/i2c/ds90ub953.c +++ b/drivers/media/i2c/ds90ub953.c @@ -683,9 +683,10 @@ static int ub953_enable_streams(struct v4l2_subdev *sd, u64 sink_streams; int ret; - sink_streams = v4l2_subdev_state_xlate_streams(state, UB953_PAD_SOURCE, - UB953_PAD_SINK, - &streams_mask); + sink_streams = v4l2_subdev_routing_xlate_streams(&state->routing, + UB953_PAD_SOURCE, + UB953_PAD_SINK, + &streams_mask); ret = v4l2_subdev_enable_streams(priv->source_sd, priv->source_sd_pad, sink_streams); @@ -705,9 +706,10 @@ static int ub953_disable_streams(struct v4l2_subdev *sd, u64 sink_streams; int ret; - sink_streams = v4l2_subdev_state_xlate_streams(state, UB953_PAD_SOURCE, - UB953_PAD_SINK, - &streams_mask); + sink_streams = v4l2_subdev_routing_xlate_streams(&state->routing, + UB953_PAD_SOURCE, + UB953_PAD_SINK, + &streams_mask); ret = v4l2_subdev_disable_streams(priv->source_sd, priv->source_sd_pad, sink_streams); diff --git a/drivers/media/i2c/max96714.c b/drivers/media/i2c/max96714.c index 159753b13777c..c982bca708ff5 100644 --- a/drivers/media/i2c/max96714.c +++ b/drivers/media/i2c/max96714.c @@ -272,10 +272,10 @@ static int max96714_enable_streams(struct v4l2_subdev *sd, } sink_streams = - v4l2_subdev_state_xlate_streams(state, - MAX96714_PAD_SOURCE, - MAX96714_PAD_SINK, - &streams_mask); + v4l2_subdev_routing_xlate_streams(&state->routing, + MAX96714_PAD_SOURCE, + MAX96714_PAD_SINK, + &streams_mask); ret = v4l2_subdev_enable_streams(priv->rxport.source.sd, priv->rxport.source.pad, @@ -306,10 +306,10 @@ static int max96714_disable_streams(struct v4l2_subdev *sd, int ret; sink_streams = - v4l2_subdev_state_xlate_streams(state, - MAX96714_PAD_SOURCE, - MAX96714_PAD_SINK, - &streams_mask); + v4l2_subdev_routing_xlate_streams(&state->routing, + MAX96714_PAD_SOURCE, + MAX96714_PAD_SINK, + &streams_mask); ret = v4l2_subdev_disable_streams(priv->rxport.source.sd, priv->rxport.source.pad, diff --git a/drivers/media/i2c/max96717.c b/drivers/media/i2c/max96717.c index 9259d58ba734e..e18b07b3259c1 100644 --- a/drivers/media/i2c/max96717.c +++ b/drivers/media/i2c/max96717.c @@ -446,9 +446,10 @@ static int max96717_set_fmt(struct v4l2_subdev *sd, stream_source_mask = BIT(format->stream); - return v4l2_subdev_state_xlate_streams(state, MAX96717_PAD_SOURCE, - MAX96717_PAD_SINK, - &stream_source_mask); + return v4l2_subdev_routing_xlate_streams(&state->routing, + MAX96717_PAD_SOURCE, + MAX96717_PAD_SINK, + &stream_source_mask); } static int max96717_init_state(struct v4l2_subdev *sd, @@ -508,10 +509,10 @@ static int max96717_enable_streams(struct v4l2_subdev *sd, if (!priv->pattern) { sink_streams = - v4l2_subdev_state_xlate_streams(state, - MAX96717_PAD_SOURCE, - MAX96717_PAD_SINK, - &streams_mask); + v4l2_subdev_routing_xlate_streams(&state->routing, + MAX96717_PAD_SOURCE, + MAX96717_PAD_SINK, + &streams_mask); ret = v4l2_subdev_enable_streams(priv->source_sd, priv->source_sd_pad, @@ -551,10 +552,10 @@ static int max96717_disable_streams(struct v4l2_subdev *sd, int ret; sink_streams = - v4l2_subdev_state_xlate_streams(state, - MAX96717_PAD_SOURCE, - MAX96717_PAD_SINK, - &streams_mask); + v4l2_subdev_routing_xlate_streams(&state->routing, + MAX96717_PAD_SOURCE, + MAX96717_PAD_SINK, + &streams_mask); ret = v4l2_subdev_disable_streams(priv->source_sd, priv->source_sd_pad, diff --git a/drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c b/drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c index 051898ce53f43..c39c15709a170 100644 --- a/drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c +++ b/drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c @@ -360,9 +360,10 @@ static int ipu6_isys_csi2_enable_streams(struct v4l2_subdev *sd, remote_pad = media_pad_remote_pad_first(&sd->entity.pads[CSI2_PAD_SINK]); remote_sd = media_entity_to_v4l2_subdev(remote_pad->entity); - sink_streams = v4l2_subdev_state_xlate_streams(state, CSI2_PAD_SRC, - CSI2_PAD_SINK, - &streams_mask); + sink_streams = v4l2_subdev_routing_xlate_streams(&state->routing, + CSI2_PAD_SRC, + CSI2_PAD_SINK, + &streams_mask); ret = ipu6_isys_csi2_calc_timing(csi2, &timing, CSI2_ACCINV); if (ret) @@ -390,9 +391,10 @@ static int ipu6_isys_csi2_disable_streams(struct v4l2_subdev *sd, struct media_pad *remote_pad; u64 sink_streams; - sink_streams = v4l2_subdev_state_xlate_streams(state, CSI2_PAD_SRC, - CSI2_PAD_SINK, - &streams_mask); + sink_streams = v4l2_subdev_routing_xlate_streams(&state->routing, + CSI2_PAD_SRC, + CSI2_PAD_SINK, + &streams_mask); remote_pad = media_pad_remote_pad_first(&sd->entity.pads[CSI2_PAD_SINK]); remote_sd = media_entity_to_v4l2_subdev(remote_pad->entity); diff --git a/drivers/media/platform/nxp/imx8-isi/imx8-isi-crossbar.c b/drivers/media/platform/nxp/imx8-isi/imx8-isi-crossbar.c index 93a55c97cd173..8f61145435e32 100644 --- a/drivers/media/platform/nxp/imx8-isi/imx8-isi-crossbar.c +++ b/drivers/media/platform/nxp/imx8-isi/imx8-isi-crossbar.c @@ -141,7 +141,7 @@ mxc_isi_crossbar_xlate_streams(struct mxc_isi_crossbar *xbar, * routing table are guaranteed to have the same sink pad. * * TODO: This is likely worth a helper function, it could perhaps be - * supported by v4l2_subdev_state_xlate_streams() with pad1 set to -1. + * supported by v4l2_subdev_routing_xlate_streams() with pad1 set to -1. */ for_each_active_route(&state->routing, route) { if (route->source_pad != source_pad || From patchwork Wed Feb 19 19:11:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cosmin Tanislav X-Patchwork-Id: 13982733 Received: from mail-ej1-f42.google.com (mail-ej1-f42.google.com [209.85.218.42]) (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 7548C21CC41 for ; Wed, 19 Feb 2025 19:11:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739992319; cv=none; b=e3KDs9JC5rvHLRXx24JgeNiY5pwYqfgwQTmjp44LvnBFGrlMmlCu8cAi8vVp5k4EWoIZp/dfYGJnoZ84HLjlQvulV+wef6Yf6Q+WlWqruemy0Hl96mhMoOC0V1mwduxWu2v2If85PanulL80Q9pXbQLQQPjkqtu3d7tImnWu/x8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739992319; c=relaxed/simple; bh=2qxO7sp4fQZHW4yc/WU6++oB4+ROKixIPdfhd+lJVwM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NPQe6ipPVsbv0cqdA3tlgSoM8tmlYktaT5ELcDbeIk5RajxF9Q10VatCt3HwDRdAnVoY04tDWMl2wFgN4Nl5RT53lQhUwuhtxBGcbFdSfO3eGW+2qi4xA+209Yk5FaMg8PAuJaf5qKfsj5hDdq2Qhckv9fFO1crzp1EupPLxgic= 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=LQMaaL29; arc=none smtp.client-ip=209.85.218.42 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="LQMaaL29" Received: by mail-ej1-f42.google.com with SMTP id a640c23a62f3a-abb7a6ee2deso32958266b.0 for ; Wed, 19 Feb 2025 11:11:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739992316; x=1740597116; 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=EwHvox6WJGQYQEIxf5WT1th5ef4Nf6RAE7x7WQqDiYU=; b=LQMaaL29jI5apt9WRLOzM1XfTjIKinZIb9NRaJsnohJoTpuD079UqF0tK6HybB0Xk2 s5WTdMHXynw5dIpeGwSiT34pLkkzBURaiTJCqo1mSwVq+wMADoBwatneJFI3qoBIC+iF 4qmPjDk12VbdYD648a6AmhP5RJW3Y2xNUhUhQCiUfY4CdkRwvgNceyqzgHdqA87DBAEj mXOtdBvTDQ3WLzYub4o5h9MryrmTfNWAFt3pyxh64UgjZZj+ETH7NCtuOYILCRNEFdON EghBToEwvhHOF56+eKO86i3mXlLN7TCWAA8uBU47ojU6UUKoau9iU+7W0ePSrW9OrFRd VdKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739992316; x=1740597116; 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=EwHvox6WJGQYQEIxf5WT1th5ef4Nf6RAE7x7WQqDiYU=; b=tntdPTSeQRBzsgo2d7vElit2dpb2EjI8o96KOmHC/1TL8fJhjkZqBHRcSyZvP2WEpf NTUhQG9Jx59EyZ/l//D9z++yH6EiZd/nJBLNoQ5KRwBLIlkjNRO7DZ17OXfiHUECQTbO ALlZiRMQXTDK7lmZ9ovOItu6l/3FZSvtoqprKAITT/jjBu0lg+a2L6cITar8nbpEt4Xx 5ShTYmuez8JvBhnZtLkUidxSUuM+RZhEq3F+anfKeMnz9L8BMF8NK2TjWkLSE/vhhsEJ 0CjwWhLIoS/EWPmHBfB3EGydgYofZPJvqpntiZmHQmgC7x/vudDwdC1GuEnVZCNPymzD Dh2Q== X-Forwarded-Encrypted: i=1; AJvYcCUa5EvzBd9GpnT2ZUrDV9qlmRd36WYspDq6qPoH9SOVC8j/B3jbmTgoAbat7YmewqcmbDM=@lists.linux.dev X-Gm-Message-State: AOJu0YyJjo7zeBnZSkH2YG1Z8fzPcOL6HV5fbO+JTU/BL/stmOD8kc8l 6yIo6cWs3VMfH9GuOGOTKt48aUf5AJbEg2ia+fYciMEvSqGVO4mR X-Gm-Gg: ASbGncvoQopuz0xP0quvCtrpx669pssh5KmkROGl4Uwh5MYPLYc8VqbU3yWwveBR5Cx VT/wPrXpxqXJ5OGh3cXwzrbtPBHgJQdTBGjZCM1wamFN+o0RuNgo0Pe3dpxLGiJRdXmYzMdz5kF e6FJxOQxZ7ChATx9mtL0JjWJ90cqcGUG2S3nxjZ03sJcivotkLtUxkAEexj3uL/jnGHHgZrglGN yqs9ADKdh31mdCFjIdt2FtqznUJA5GoKxUJhUMvwqBtOoQvg4Wybr9HEXgqp9YkGaj/54PnA5QN Tzkh2eaKkX3M9qpA2FVSjDPvbti0 X-Google-Smtp-Source: AGHT+IFyOBwXGTpSYagOOpkWDMhkVuORfStvj5grnxd98RQN2N6gtL61zwIr20Bcm+RaMlN8QO+yKQ== X-Received: by 2002:a17:907:7815:b0:ab7:d06d:b4bf with SMTP id a640c23a62f3a-abbcd059bf2mr461138366b.39.1739992315757; Wed, 19 Feb 2025 11:11:55 -0800 (PST) Received: from demon-pc.localdomain ([188.27.130.21]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-abbe0d39f9csm127767866b.69.2025.02.19.11.11.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Feb 2025 11:11:55 -0800 (PST) From: Cosmin Tanislav To: Cc: Tomi Valkeinen , Mauro Carvalho Chehab , Julien Massot , Sakari Ailus , Bingbu Cao , Tianshu Qiu , Laurent Pinchart , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , Hans Verkuil , Umang Jain , Cosmin Tanislav , =?utf-8?q?Pawe=C5=82_Anikiel?= , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org Subject: [PATCH 3/3] media: v4l: subdev: remove v4l2_subdev_state_xlate_streams() Date: Wed, 19 Feb 2025 21:11:32 +0200 Message-ID: <20250219191136.215151-4-demonsingur@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250219191136.215151-1-demonsingur@gmail.com> References: <20250219191136.215151-1-demonsingur@gmail.com> Precedence: bulk X-Mailing-List: imx@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 All usages of v4l2_subdev_state_xlate_streams() have been replaced with v4l2_subdev_routing_xlate_streams(), remove it. Signed-off-by: Cosmin Tanislav --- drivers/media/v4l2-core/v4l2-subdev.c | 7 ------- include/media/v4l2-subdev.h | 14 -------------- 2 files changed, 21 deletions(-) diff --git a/drivers/media/v4l2-core/v4l2-subdev.c b/drivers/media/v4l2-core/v4l2-subdev.c index d1581f1036487..1fb413bb337a3 100644 --- a/drivers/media/v4l2-core/v4l2-subdev.c +++ b/drivers/media/v4l2-core/v4l2-subdev.c @@ -2067,13 +2067,6 @@ u64 v4l2_subdev_routing_xlate_streams(const struct v4l2_subdev_krouting *routing } EXPORT_SYMBOL_GPL(v4l2_subdev_routing_xlate_streams); -u64 v4l2_subdev_state_xlate_streams(const struct v4l2_subdev_state *state, - u32 pad0, u32 pad1, u64 *streams) -{ - return v4l2_subdev_routing_xlate_streams(&state->routing, pad0, pad1, streams); -} -EXPORT_SYMBOL_GPL(v4l2_subdev_state_xlate_streams); - int v4l2_subdev_routing_validate(struct v4l2_subdev *sd, const struct v4l2_subdev_krouting *routing, enum v4l2_subdev_routing_restriction disallow) diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h index 90d08e13e016b..3781d6d8465bd 100644 --- a/include/media/v4l2-subdev.h +++ b/include/media/v4l2-subdev.h @@ -1604,20 +1604,6 @@ v4l2_subdev_state_get_opposite_stream_format(struct v4l2_subdev_state *state, u64 v4l2_subdev_routing_xlate_streams(const struct v4l2_subdev_krouting *routing, u32 pad0, u32 pad1, u64 *streams); -/** - * v4l2_subdev_state_xlate_streams() - Translate streams from one pad to another - * - * @state: Subdevice state - * @pad0: The first pad - * @pad1: The second pad - * @streams: Streams bitmask on the first pad - * - * This is the same as v4l2_subdev_routing_xlate_streams, but takes subdevice - * state as parameter - */ -u64 v4l2_subdev_state_xlate_streams(const struct v4l2_subdev_state *state, - u32 pad0, u32 pad1, u64 *streams); - /** * enum v4l2_subdev_routing_restriction - Subdevice internal routing restrictions *