From patchwork Thu Feb 20 09:20:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cosmin Tanislav X-Patchwork-Id: 13983534 Received: from mail-ed1-f46.google.com (mail-ed1-f46.google.com [209.85.208.46]) (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 2D5C61EDA0B for ; Thu, 20 Feb 2025 09:20:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740043247; cv=none; b=gU0lXIfcUqlhD1SsHFiqmbvwXCvSKvWlqMRDHcXihphXOCRvOzFpMd2lLKYzsmXiUtCi/7YEhqBs7iqJb3rdgXSzp5zPk4TDXgHAGQJh27R/cdaj321yoAllyBxRATBBlG+zZQ3eOlI7ljLbpyWP2CEnU74Cowkl4AjWijAoATk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740043247; c=relaxed/simple; bh=BshHmlA8ttxolsOurdqseo8CCumiC32LYbngrBvTgbo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=I5ccpKiohzv4pziDMdwvbtn30fyRII+/i+NDMf6bi0lVv56zmSxEIl7TNNrqXfqmgML1Se0L+C62qbd4ivLBRLunZp17j/N3tqpNTly1FWgpjG7sBnLJ/Ctv43CgRvYL96r/NEd94h0IWl3kbLSkL+hJ5JFDzgcN/5P/UHx4IWY= 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=F/T5HhzN; arc=none smtp.client-ip=209.85.208.46 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="F/T5HhzN" Received: by mail-ed1-f46.google.com with SMTP id 4fb4d7f45d1cf-5e033c2f106so924736a12.3 for ; Thu, 20 Feb 2025 01:20:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740043244; x=1740648044; 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=rhrXKQcf4GiiAnwrWHJFmicl2O1JAWaNA8sd6GgkbRA=; b=F/T5HhzN1YblWOSPqB6iH3VSAg6Ffm/KTUVx+zpkE0moLCr+gmoNBDiHwB4PIuY5yo vXDxYilQm30AOdzEzlfrnJYZkdXFmWN1YVjwnfMtGUv6isoaCXqmp91lTwU2qEEaInSP 0Jv8g2mWINrX4RhM9QDnf2e2pKei91MubQ0x5D2cesYxl2JKVu6YRJLY+Bnjs8Svwmc1 jysDrh24zPBuGP9v3nnZS/Sb9M7dGgh6JeGe7IxZd0qYKYt2ex3yB7drl6YwGI+Nw3BK yG9Y+kMZTV3676+xm0NeiKJTTZcKSKKUpg5gnuNEAJWQcKfmUkpPQNUKQilv4p8WJFg0 JGKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740043244; x=1740648044; 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=rhrXKQcf4GiiAnwrWHJFmicl2O1JAWaNA8sd6GgkbRA=; b=ihPZzHR8kt9VPeGemhKpo9h3UfFii5/nAGibW7drtIPf3BC9RmIPCVwmpFC1O4pw2X lNuv2jVCBxdiqZSPRloyhMQsoW+J3eL8KMDhXQJUukF5UvVToMFl7jVGbQ2ga2LClu1f C8yeQn0U6p2MNOqMoQUlvVZrf9lyqKjU2vUoV+bu9+s8M0VLZplMFgu5puBU9B5RjsVc iIzajZWbP8y5HFP4GYlvW+08Ih+P2X5ipp2LzVmM5PU9TcLGFjuIFxtl4dOtOJ2rccpD UN1yiHS+LDNLf/RJ/uTYBEWvQM6K8aJX3TySNN2NRVYmgAjuKa4h1QWucQc900SiHjPF JoCQ== X-Forwarded-Encrypted: i=1; AJvYcCXUkUW/nY2Cr5mAmmoJooHA7pDSu4Ul9IdROdUorXjbbYlRGV/Jxveyb9btokgoAHBZN+s=@lists.linux.dev X-Gm-Message-State: AOJu0YyIR4R4egd/tLnShXiZoq3CKPd4UaStcqCxIpJgKWGR+a/y13Tx EhwxIRt52Ujdv8lx0XqkP/nWkbCV9Bfzr43LmkJjm201TiKcePVv X-Gm-Gg: ASbGncumH9RUwsqce8E0DCSGOCIeL0IcLoHBhguEucbE9JfhKcZLToaWb4Guz+ZKJ+V /c42gdBJahmnDhNYjYZMZdkSyCzrbq/t7RVul2teGxGu/DjhdeW6dLJTjVzY1P0ERAN0dNWfnZs CRqUplbykr+zgFRALKajy9Y/efIC4Wz2M1jGdA/gmkm8NAha7Q+ycEG+ZL+UfsgA1kXZ/6OFyMm H2YjXdCUaV7E5i7ZQociBtvqKnaLnksuheKNxjfE4xWiGZrcIzX20K96LxyE68crukftpJh+KK7 uPDh8Fay2VE8CFzm/LZ1OxC72r7e X-Google-Smtp-Source: AGHT+IGELBAVHlT1FsAwAPLAfs/8eHa7w1H1BXAuCz31GVyau0LU+/O4GL+wfZn7+PcEvnxYdppSug== X-Received: by 2002:a05:6402:1ecd:b0:5df:6a:54ea with SMTP id 4fb4d7f45d1cf-5e03602f764mr55679741a12.11.1740043243699; Thu, 20 Feb 2025 01:20:43 -0800 (PST) Received: from demon-pc.localdomain ([188.27.130.21]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-abba358ec3asm665574866b.35.2025.02.20.01.20.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Feb 2025 01:20:43 -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 v2 1/3] media: v4l: subdev: add v4l2_subdev_routing_xlate_streams() Date: Thu, 20 Feb 2025 11:20:33 +0200 Message-ID: <20250220092036.6757-2-demonsingur@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250220092036.6757-1-demonsingur@gmail.com> References: <20250220092036.6757-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 | 20 +++++++++++++++++--- 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/drivers/media/v4l2-core/v4l2-subdev.c b/drivers/media/v4l2-core/v4l2-subdev.c index a3074f469b150..91fa51259237e 100644 --- a/drivers/media/v4l2-core/v4l2-subdev.c +++ b/drivers/media/v4l2-core/v4l2-subdev.c @@ -2044,10 +2044,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; @@ -2068,6 +2067,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 57f2bcb4eb16c..e49dba3c59bd6 100644 --- a/include/media/v4l2-subdev.h +++ b/include/media/v4l2-subdev.h @@ -1584,9 +1584,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 + * @routing: 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 @@ -1595,7 +1595,7 @@ v4l2_subdev_state_get_opposite_stream_format(struct v4l2_subdev_state *state, * the subdev state routing table. Stream numbers don't necessarily match on * the sink and source side of a route. This function translates stream numbers * on @pad0, expressed as a bitmask in @streams, to the corresponding streams - * on @pad1 using the routing table from the @state. It returns the stream mask + * on @pad1 using the routing table from @routing. It returns the stream mask * on @pad1, and updates @streams with the streams that have been found in the * routing table. * @@ -1603,6 +1603,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 Thu Feb 20 09:20:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cosmin Tanislav X-Patchwork-Id: 13983535 Received: from mail-ed1-f51.google.com (mail-ed1-f51.google.com [209.85.208.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 569721EEA37 for ; Thu, 20 Feb 2025 09:20:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740043250; cv=none; b=XGcF9fGKA/vq1XfrqqljoHf/PuTgdbIihyDuZZCYui5Z0ikwU2SdTVYHR5+//3N/j9l2ZdbIeFE2aEdgOngp5205UIx/66jMo1aio0bQ8krU+7N8SnDaZKdVa+taRz1BOF9iCw5/sylGigXPJwweb5h6YAoJsK8ziVez7db25S0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740043250; c=relaxed/simple; bh=w4d0D4WVsIinUPHtArcYQiWglj6W0S5nl0XEwnm4vjI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=S+sut9mfSZFIIXxVXQPCa6G61GgJGkoX1vb+QODzBdafhY1GmzirCYn5Z4eOY3kKxzfILJ2z1Ng6c1Y1T40XnFpMXSwaDFBCs4Msw+XOCbrLWMPTBddhtVTuR1YvkgGfQspd7Pr3vMXwNhJKe/ScUXaLc7utaqHzJkzZjfOcsYk= 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=S1BpYkDa; arc=none smtp.client-ip=209.85.208.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="S1BpYkDa" Received: by mail-ed1-f51.google.com with SMTP id 4fb4d7f45d1cf-5e050b1491eso3228866a12.0 for ; Thu, 20 Feb 2025 01:20:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740043246; x=1740648046; 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=C9t5ETeu0PXD9T03gr3t0rpnaMSHCppSAmRkHp3tbNs=; b=S1BpYkDaj+4alHoLrwLHZLJvSSd1QiZvNh6BJwhta8twg086abn8GGNIaBanNEh5Lr XgCUkRcX0gQH6ImO2a+wAwoGFCkJZWO4z75JZYYgYfZlRXZQeBkgecaTQyJRfQr3Dr2p AOKPUGt9Kfjw/Ioj06mhmw84Lt3b0L5aWBdMqFQ/vxYRS5aLUpOjFyBAtBQ+a9UybGCI BlZoXD6rIl+K95O7AV/ZN4G2tTAMYZdXXrzgCEiu4ZTxp6IlThJ2DKiw9vPhbmV7U17l 9LnDCGsPq625ZdB+Lz1qwMLW4nfjpgnRJEsQmk8VeKWcfKDFP+xZG83mBSzG0aznYHju xdsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740043246; x=1740648046; 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=C9t5ETeu0PXD9T03gr3t0rpnaMSHCppSAmRkHp3tbNs=; b=qXM7FCHJnWGiZ6U1evyJt2qsd6R3okGlDDKY/IxbfeDDzvMpGYHHOBYIB7GtWTSa4x 5gltATVhqheL4DeRAjF6WZRB7KNq/FSR4N0OfVhXi9JHT1knlRnGK/YvtqhjwTVDYp0v gzq7EXg7ifPinNZSUY5RQUkIGUsry9l073nji7C5bhtQgAon4Lr0J07+jQYjjHs6zv1y jl7PtEvv/dXJ41OSDCS4n/FdMfMS8QrobwqJJxgKQOph37LXyDyHkqrf6H96bD/rob4/ 6JYurlp19bXtFMmoD3m/8XsJAS/+V01Utjmg7TrS3VHYll1TVhoN5saZaAasxQanV4P6 36IA== X-Forwarded-Encrypted: i=1; AJvYcCX/LWAmcmJvc+t9bd2dATX5QgO/vqklfIGwITgzzbWfnjfTz86XrZCQvUKIpEgKwYG1qck=@lists.linux.dev X-Gm-Message-State: AOJu0YxN1SPKiCgxZZ+B0xfI2JjSvo5Z2X4+1kF3+uoqRk1e1Fz6Zoyw 3xXGA/ggVXs+yZLEVg9EZ4KTQhoSb4LWUUjrHkzkLspA2MA6PISr X-Gm-Gg: ASbGncsewqdKBBTos5amHsxBWtHmD83c2nenrV+JuIODqqD9Ufte9O3UGs1IqPWqGVQ z1pkECp5wj4p3F6HcCUZcsf2ZPQ8+tKfN1vYoP5j66w41XJF3UVng+vwI4LneBk6OTTulDrdbtr D8uomJPQYD0siQ6VeYObYY2VdEYnLuRAVlKTgYfdhS3V+IbAHTVYqZqi8UrB49zbjobJkcVkXgX l3WmZSddJkR1hwedCxT9+iMlDpqGIcuOyVr3ZLDUAHSMzJsJyD6i22M64hseLlnmmqn/dZscfei 9bVWmWgaAJlqpcFMG7l80S8p248j X-Google-Smtp-Source: AGHT+IEE28wc+KTqMadXPz0HUq5xegTrNkJUOB+B0TPRfEXrPgPkWCab8fU38OLa/faZdXdJ85ieJg== X-Received: by 2002:a17:907:c48f:b0:ab7:b9b5:60ff with SMTP id a640c23a62f3a-abbedd31efbmr244293866b.2.1740043245586; Thu, 20 Feb 2025 01:20:45 -0800 (PST) Received: from demon-pc.localdomain ([188.27.130.21]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-abba358ec3asm665574866b.35.2025.02.20.01.20.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Feb 2025 01:20: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 v2 2/3] media: use v4l2_subdev_routing_xlate_streams() Date: Thu, 20 Feb 2025 11:20:34 +0200 Message-ID: <20250220092036.6757-3-demonsingur@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250220092036.6757-1-demonsingur@gmail.com> References: <20250220092036.6757-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 da8581a37e220..31fcf1695cb7c 100644 --- a/drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c +++ b/drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c @@ -354,9 +354,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) @@ -384,9 +385,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 Thu Feb 20 09:20:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cosmin Tanislav X-Patchwork-Id: 13983536 Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) (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 94BB71EF08D for ; Thu, 20 Feb 2025 09:20:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740043251; cv=none; b=tP2lYZtK3epAA9Lz5bk0LQdVt2vU+6q7rRzaHAT0i06ucIOeSExI1vwyrkGIDkSSM1S+UIkeQkfIw7TJffKIm10bm8Jr6iZQVlLcBaOG0qRYm+qTn0ZCR3FnIEI4RDjGzO2K+uf9OILqrgTCtqQ4+AiFwIfz9bcJaAWx37bQRt8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740043251; c=relaxed/simple; bh=Di0pc8+mVoIIZUxrN5rf1K7d3PKUOyY+l/aCtguTkgk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=D5x0ANBjpmmlMFgxsi1LCTKP5uu8cGUY/sFLVyYaGWqCEn+gxvUbg9Bgep4AE//w02rvyjhGW5MxT7C1BjoxwDa8+DNMAihl25VDLBi6LO9Mxz3j8+knV45hfR2wwRvrkAh2Ak2bBr/8usR2o6/nYJt8vNIPud/c5PY+/8XHMqk= 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=nBrgUIdz; arc=none smtp.client-ip=209.85.128.53 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="nBrgUIdz" Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-4398c8c8b2cso6184275e9.2 for ; Thu, 20 Feb 2025 01:20:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740043248; x=1740648048; 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=MIvWg4Gn9o+G9evf8cWLdDcl8No09as61/YnZypW0HQ=; b=nBrgUIdzsd0KaOLfAWD4MUc/HNhP8C7T65lm7+xp54ARb4ti69PV/8U8qFQhbPmrF4 9+vgUgGMQ0lpbiPwcQm6zXO+zs6GqMNGrgfQVWCnrfp50DeBIN81sM5208gxGvLkhBJC 1c26BL9H+PwNBeEHjSQe5CohBW8EM+KHPfxICRnvof2Vj7bLQ/H9oSGl97csEMrUI+yD XzV00LntgwLMGLrl8Ebh9LPh/9mUwNoVgMQRY32vWL22XJnD9qdBZOelEb0NoIjFcf6f g2h6db16W781ti1Tc8jejWvcTekAgdvck6f+JJ9p5gRAiuc5SFBhJrtZ7VcO/3Eon+lz fz+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740043248; x=1740648048; 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=MIvWg4Gn9o+G9evf8cWLdDcl8No09as61/YnZypW0HQ=; b=GUsWL9jYaQ5cYZjBebYcndOEdbT/25n7Qh7MwAhZ1s3WF3K2hc/8szkrYxldoDfG5s sU2KAI5ydTiYMI2kmtaSZJiL/1wfAuJQAAfoulhth4ca3meh6Q1pbsM75HBb1PYl+nFB ADwf51yAcWAjBKaZ1EifbZ0t0apkWgTtAdu4wlGyvp6QxzoYYzUXyAty3EYYi11pTSUN /mIf9vUT6GohSP8D7mQrVB7e+D449EwaRgjS/f54it7bPcIFJn1IKwPaIHjOf9GYlSS7 d+ib5LzqGoksYCKdoFwczQ9UlHwDTSmU2ySahJ9shCJs/nJyi1u9R6CIlV51uB3wPhBh bjfA== X-Forwarded-Encrypted: i=1; AJvYcCVotqrKMBSeF31r2UBd4PFjZpq2OGgrfWYWdGe5IyfO7Ema75fYl/c4aMZiQCW3jvPJRtc=@lists.linux.dev X-Gm-Message-State: AOJu0YwZh1uUs51NQvYl6/SjfbzOd0q7Tdj6gmMvg0bGoUlGktP21aBE 1jIesO3Lvxy83ywOz9c1uY2pj6lw7mWDplgkIVDPF6nAVliYifZh X-Gm-Gg: ASbGncsr9OxwEWHH7mYAN3cD0m9ce8hxIAAXSGFfRkIckJopBCoeHCryOKholLW7egw XEYZt046IHrM1DxUWHrsGSYluvYST1ceUrfQhkWUnhWGIItq0lf9Nsu2xfCZeMZbYw8UJ7D0dHp tPbXb0f8CW4Vu8swmUjGCj1FczLGpG3wxdWSt8Czq5RjoWQ+iXPO0R4ZHvUxeS4jX6S8Y7ETaM9 GwyTshCN9cTYkM7PVNaO8NDDHl4KNkVFIb3g3965NUa07tcF1y6Tudp+czOBV8e5zTcEUuvPWEm CcblI+r/0MY2us3fTJdBjCEETtY3 X-Google-Smtp-Source: AGHT+IFUfAy/nA4NjDORyka7i757ce3BhJX0W1jdcc9Lq8KT042PAkdLHvg8+1RRG5/LjvlPDzql7Q== X-Received: by 2002:adf:e709:0:b0:38c:3f12:64be with SMTP id ffacd0b85a97d-38f33f51157mr22341024f8f.35.1740043247411; Thu, 20 Feb 2025 01:20:47 -0800 (PST) Received: from demon-pc.localdomain ([188.27.130.21]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-abba358ec3asm665574866b.35.2025.02.20.01.20.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Feb 2025 01:20:47 -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 v2 3/3] media: v4l: subdev: remove v4l2_subdev_state_xlate_streams() Date: Thu, 20 Feb 2025 11:20:35 +0200 Message-ID: <20250220092036.6757-4-demonsingur@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250220092036.6757-1-demonsingur@gmail.com> References: <20250220092036.6757-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 91fa51259237e..985d30c22acae 100644 --- a/drivers/media/v4l2-core/v4l2-subdev.c +++ b/drivers/media/v4l2-core/v4l2-subdev.c @@ -2069,13 +2069,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 e49dba3c59bd6..0fa732e6dd55d 100644 --- a/include/media/v4l2-subdev.h +++ b/include/media/v4l2-subdev.h @@ -1606,20 +1606,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 *