From patchwork Mon Mar 24 08:00:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomi Valkeinen X-Patchwork-Id: 14026891 Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9109B1F92A; Mon, 24 Mar 2025 08:00:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=213.167.242.64 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742803252; cv=none; b=pjv+1xAfbw4m7qXAp/zYmv328D6Oq6OYLS6CZtjbuMOmdhemUi8cXis0GO92aMCIeqmVSB8dmtFVKD/X1RNtcvL8XJLkKCEcEJ7eAL7goLcgm9et0jWeLJTSjWqEdO651rKxV5SIDFx9IMW1yxKX8QwqcODNUDkNdrGbg+u5GDM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742803252; c=relaxed/simple; bh=2AgGgd3+UZKSFw+Wwgnhw/YNDPJkEftVNvUe4+/jQ4w=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Al7O3ZyBE+N6PnLJamrAr49qXjVDi0FLX/Zg+22AeUV3hNibqHr28J024M+MDaGz5Mu7yXcVxOXknYeXijI0eCYqtOZ1nimuFo2ckVUGnMxLjBj2Upenh8HGwbEsBgGqDjyQBNOWZ3rFJEK94zXs9ekHc+JPuxivRJbKXAyVcQw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ideasonboard.com; spf=pass smtp.mailfrom=ideasonboard.com; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b=paIRsMG6; arc=none smtp.client-ip=213.167.242.64 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ideasonboard.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ideasonboard.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="paIRsMG6" Received: from [127.0.1.1] (91-158-153-178.elisa-laajakaista.fi [91.158.153.178]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 6AB83A8F; Mon, 24 Mar 2025 08:58:56 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1742803136; bh=2AgGgd3+UZKSFw+Wwgnhw/YNDPJkEftVNvUe4+/jQ4w=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=paIRsMG6NroOs3zc/2H6ExtjfZt/eGvi1p+4WT7UJzIZFMCbZ4X6+G7I8iOGoDBaV rwg0uetQXIaDtzYxyzHPSpYEltMfgsLRHny80Qj7GzKsMA/cnPrhmXLjqa4JtdrXtf OE3lTmhgIMkKIrOIL5XwvP8phgmiEbnQ+tcZB9A8= From: Tomi Valkeinen Date: Mon, 24 Mar 2025 10:00:11 +0200 Subject: [PATCH v3 1/3] media: subdev: Add v4l2_get_frame_desc_passthrough helper Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250324-frame-desc-passthrough-v3-1-993839a1f9b3@ideasonboard.com> References: <20250324-frame-desc-passthrough-v3-0-993839a1f9b3@ideasonboard.com> In-Reply-To: <20250324-frame-desc-passthrough-v3-0-993839a1f9b3@ideasonboard.com> To: Mauro Carvalho Chehab , Laurent Pinchart , Sakari Ailus Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Tomi Valkeinen X-Mailer: b4 0.15-dev-c25d1 X-Developer-Signature: v=1; a=openpgp-sha256; l=5389; i=tomi.valkeinen+renesas@ideasonboard.com; h=from:subject:message-id; bh=2AgGgd3+UZKSFw+Wwgnhw/YNDPJkEftVNvUe4+/jQ4w=; b=kA0DAAgB+j2qjLyWHvUByyZiAGfhESjIh3dE9y8BZItwtvDHZhpBwYAg3TJ0T4hRp2MmZ8TDq 4kCMwQAAQgAHRYhBMQ4DD6WXv2BB5/zp/o9qoy8lh71BQJn4REoAAoJEPo9qoy8lh71vBkP/RK6 oNsERLugfCBEueXhSIRdJHo+QA4RsWvOpJoBsDsWfpcsUkVxdnXzbNTIMpLL05/bg8E9Hf9QP39 VmzyviX55zUYw8DNC+gsLlF3c/O+XAmd2+XU3xLlf/clcGrfdYhLt9EqxpZi07tKT8yqh2z1/qc peICiw7Mz1sLGMW5BcRiCML7KYNOAvoHc9P/KJoA2A6R8I012rvzRoOAHScLd5fvxvbBbXHPzAV 3yNqz0Vv/EK1a4yIJ7+hekJ1UK00NGYmbh+bL1uakVSZlYI1PEAG7ZeqMnhCjnQ2CKumgS2G3ci 4nJLRqv/YkB2Ri+wVEHETjEu/REPuOPfbUe6iOf2al/QdFhB2MY6ZhC03CJXdLQk8Nm+4Y1eF6c im7RaDRabGC9WWmxRPDL3gDF9wm3mm2gtP/DHlAcMO7W+6OeOTIhXypP0H3WN28vRXOGy1Bi89f cAfwGq/WI4dyS4bpRWJuMR2AedZlST11q5v+nwLSpbZh9mSOhrIWwgXJucbsClQMVcSqUJJiTqL kPTbw5S+AMC0ISpPYLZS908BZmw2Jrba29ezlVWRM6ybHA4TOONS/BOlR5SPHxxc1oyQQdWZGzC qkpFL0L88roBmCbyeemwTdpvudQvigfYjAulyuUNO0M5br5X4275m/1ihydUyfyVjgXhCDzqVId Po7nQ X-Developer-Key: i=tomi.valkeinen+renesas@ideasonboard.com; a=openpgp; fpr=C4380C3E965EFD81079FF3A7FA3DAA8CBC961EF5 Add a helper for v4l2_subdev_pad_ops.v4l2_get_frame_desc operation. The helper can be used when the subdevice directly passes through the streams. Signed-off-by: Tomi Valkeinen --- drivers/media/v4l2-core/v4l2-subdev.c | 113 ++++++++++++++++++++++++++++++++++ include/media/v4l2-subdev.h | 22 +++++++ 2 files changed, 135 insertions(+) diff --git a/drivers/media/v4l2-core/v4l2-subdev.c b/drivers/media/v4l2-core/v4l2-subdev.c index a3074f469b15..a415d3234ca6 100644 --- a/drivers/media/v4l2-core/v4l2-subdev.c +++ b/drivers/media/v4l2-core/v4l2-subdev.c @@ -2502,6 +2502,119 @@ int v4l2_subdev_s_stream_helper(struct v4l2_subdev *sd, int enable) } EXPORT_SYMBOL_GPL(v4l2_subdev_s_stream_helper); +int v4l2_subdev_get_frame_desc_passthrough(struct v4l2_subdev *sd, + unsigned int pad, + struct v4l2_mbus_frame_desc *fd) +{ + const struct media_pad *pads = sd->entity.pads; + struct media_pad *local_sink_pad; + struct v4l2_subdev_route *route; + struct v4l2_subdev_state *state; + struct device *dev = sd->dev; + int ret = 0; + + if (WARN_ON(!(pads[pad].flags & MEDIA_PAD_FL_SOURCE))) + return -EINVAL; + + state = v4l2_subdev_lock_and_get_active_state(sd); + + /* Iterate over sink pads */ + media_entity_for_each_pad(&sd->entity, local_sink_pad) { + struct v4l2_mbus_frame_desc source_fd; + bool have_source_fd = false; + + if (!(local_sink_pad->flags & MEDIA_PAD_FL_SINK)) + continue; + + /* + * Copy frame desc entries for the streams going from the sink + * pad to the requested pad + */ + for_each_active_route(&state->routing, route) { + struct v4l2_mbus_frame_desc_entry *source_entry = NULL; + struct media_pad *remote_source_pad; + struct v4l2_subdev *remote_sd; + unsigned int i; + + if (route->source_pad != pad || + route->sink_pad != local_sink_pad->index) + continue; + + if (!have_source_fd) { + remote_source_pad = media_pad_remote_pad_unique(local_sink_pad); + if (!remote_source_pad) { + dev_dbg(dev, "Failed to find remote pad for sink pad %u\n", + local_sink_pad->index); + ret = -EINVAL; + goto out_unlock; + } + + remote_sd = media_entity_to_v4l2_subdev(remote_source_pad->entity); + if (!remote_sd) { + ret = -EINVAL; + goto out_unlock; + } + + ret = v4l2_subdev_call(remote_sd, pad, + get_frame_desc, + remote_source_pad->index, + &source_fd); + if (ret) { + dev_err(dev, + "Failed to get frame desc from remote subdev %s\n", + remote_sd->name); + goto out_unlock; + } + + have_source_fd = true; + + if (fd->num_entries == 0) { + fd->type = source_fd.type; + } else if (fd->type != source_fd.type) { + dev_err(dev, + "Frame desc type mismatch: %u != %u\n", + fd->type, source_fd.type); + ret = -EPIPE; + goto out_unlock; + } + } + + for (i = 0; i < source_fd.num_entries; i++) { + if (source_fd.entry[i].stream == route->sink_stream) { + source_entry = &source_fd.entry[i]; + break; + } + } + + if (!source_entry) { + dev_dbg(sd->dev, + "Failed to find stream %u from source frame desc\n", + route->sink_stream); + ret = -EPIPE; + goto out_unlock; + } + + if (fd->num_entries >= V4L2_FRAME_DESC_ENTRY_MAX) { + dev_dbg(sd->dev, "Frame desc entry limit reached\n"); + ret = -ENOSPC; + goto out_unlock; + } + + fd->entry[fd->num_entries] = *source_entry; + + fd->entry[fd->num_entries].stream = route->source_stream; + + fd->num_entries++; + } + } + +out_unlock: + v4l2_subdev_unlock_state(state); + + return ret; +} +EXPORT_SYMBOL_GPL(v4l2_subdev_get_frame_desc_passthrough); + #endif /* CONFIG_VIDEO_V4L2_SUBDEV_API */ #endif /* CONFIG_MEDIA_CONTROLLER */ diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h index 57f2bcb4eb16..7dc8625b131e 100644 --- a/include/media/v4l2-subdev.h +++ b/include/media/v4l2-subdev.h @@ -1748,6 +1748,28 @@ int v4l2_subdev_disable_streams(struct v4l2_subdev *sd, u32 pad, */ int v4l2_subdev_s_stream_helper(struct v4l2_subdev *sd, int enable); +/** + * v4l2_subdev_get_frame_desc_passthrough() - Helper to implement the subdev + * v4l2_get_frame_desc operation in simple passthrough cases + * @sd: The subdevice + * @pad: The source pad index + * @fd: The mbus frame desc + * + * Subdevice drivers that only pass through the streams can use this helper + * to implement the &v4l2_subdev_pad_ops.v4l2_get_frame_desc operation. + * + * The helper will call get_frame_desc on the subdevice's sources, create a new + * frame desc which contains only the streams on the given source pad. The data + * for each frame desc entry is copied directly from the data provided from the + * calls to the subdevice's sources, with the exception of the 'stream' field + * which is set according to the subdevice's routing table. + * + * Return: 0 on success, or a negative error code otherwise. + */ +int v4l2_subdev_get_frame_desc_passthrough(struct v4l2_subdev *sd, + unsigned int pad, + struct v4l2_mbus_frame_desc *fd); + #endif /* CONFIG_VIDEO_V4L2_SUBDEV_API */ #endif /* CONFIG_MEDIA_CONTROLLER */ From patchwork Mon Mar 24 08:00:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomi Valkeinen X-Patchwork-Id: 14026892 Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0DBD325D1F7; Mon, 24 Mar 2025 08:00:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=213.167.242.64 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742803254; cv=none; b=nEvNHRPQ6VUqZgr4j82/jhMSx2L/xYb0cICaZUoLrI1G7KFsXtsExiUvPcRLCcfsIS//CL7vBdNHhsj2z3IiMUp+Q8+B9nxxNful3RFMcysyUWC5G30H2bBvioLzzPCMEVgMDQqYrGcpSCSd5WuLiPHAcCDqytB5rVZEvgtNsVQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742803254; c=relaxed/simple; bh=Z7qhj397sWj/XKrwjJPBIaqt/OgIzo0k41A6Jd78daA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=JX0eTfzjPffaut+qq/W1Ka/PNa511Af7W7TZCMOV5wp2Z8z+3w1IVRoRHbdfBRd0lUlmMNjH/nVUEDAM1MVKyEw3YDcqv9AiXPZnl0b951LRqUmBqh8LL0MTZJ/SHSDVqfsl0pUzQh+qFikGhWwIDne+vPHGcLS1d+wc8+3P9dM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ideasonboard.com; spf=pass smtp.mailfrom=ideasonboard.com; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b=eVJPC3bz; arc=none smtp.client-ip=213.167.242.64 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ideasonboard.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ideasonboard.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="eVJPC3bz" Received: from [127.0.1.1] (91-158-153-178.elisa-laajakaista.fi [91.158.153.178]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id E10A61059; Mon, 24 Mar 2025 08:58:56 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1742803137; bh=Z7qhj397sWj/XKrwjJPBIaqt/OgIzo0k41A6Jd78daA=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=eVJPC3bzFt2pyOrIxSJETrNL7WxoWYBd8sad9B13feTjNYYIGum32xxSFR1uEKfUC UIA4lQqXiP5XjN/iuFdlfBvq85FteySL4ddWkLDZVabsajcOuuW2kMB1ZyETGHT/yO P0bs4h9dbeTUqqGYfVqGwaX2GRfOoh6G3ScMzEB4= From: Tomi Valkeinen Date: Mon, 24 Mar 2025 10:00:12 +0200 Subject: [PATCH v3 2/3] media: i2c: ds90ub953: Use v4l2_get_frame_desc_passthrough Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250324-frame-desc-passthrough-v3-2-993839a1f9b3@ideasonboard.com> References: <20250324-frame-desc-passthrough-v3-0-993839a1f9b3@ideasonboard.com> In-Reply-To: <20250324-frame-desc-passthrough-v3-0-993839a1f9b3@ideasonboard.com> To: Mauro Carvalho Chehab , Laurent Pinchart , Sakari Ailus Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Tomi Valkeinen X-Mailer: b4 0.15-dev-c25d1 X-Developer-Signature: v=1; a=openpgp-sha256; l=2734; i=tomi.valkeinen+renesas@ideasonboard.com; h=from:subject:message-id; bh=Z7qhj397sWj/XKrwjJPBIaqt/OgIzo0k41A6Jd78daA=; b=owEBbQKS/ZANAwAIAfo9qoy8lh71AcsmYgBn4REpTWnmzdQGi9yp26TWf2NXTYCV8HoiLT2BG eLBUcvJ5oSJAjMEAAEIAB0WIQTEOAw+ll79gQef86f6PaqMvJYe9QUCZ+ERKQAKCRD6PaqMvJYe 9fE9D/sFHKwqliO24pQ2X6zTPccqTT/eClMjhO5WFobVBnX0TI6HrHfxSomKlIN0WikWzgBF4+1 11VnDQ9HYK+LC5mP2/CeN5UJFGDh7xGAAgoGxvhyof7AUlKsP9mUK++OEybfr2F6PyDJdQDMhsp 58ckZNWqQXYIB70sgGEkQWlhDokrASopK+CV+8EkaO09Fv5fxRxe+N7/dfFAiC0P9KCrfPk+y/4 dwdsnc5VmiEEerEjstqLcHDLE0I/lYT0C2sqYFYQ9bF/jhOT+QcYVexFbQh+WEdUtH3jmlWQX5i fGnF9Ejs6LJpcptOFJtm27+owXhCtgqs7yJyOKaISfwHPXz4YVMxqmdNw47Ro7yXFz5UdawQpjI cgrE9SjrY1J46pSanP83/qsvhii2vNODHPNfvKjOa/5EcpAOuH4Wwoh3vJxPlf2f7KFndZJBNLq thJ0i3uR/Eo5kHSOk1dYEKic9eJYWoBdALy9xHtfwFrQM3vY6GPDFnGT9BsdjWtyNffzuNUAj5x eVi7gEpAHPAd/6AxV8UUPeOYQayZDMHhleDB2DjC9Hx4YvpK/MrVPgFmeBGQBayDUco/utgk49e G9rZrcmMO41qL+yayKSNfbr+Zuv56JJIP34kg77L7uj0nlMrKsCMd/6k2JQL53zzI6qqbTEqS0V PvlMNeNRQqhq54w== X-Developer-Key: i=tomi.valkeinen+renesas@ideasonboard.com; a=openpgp; fpr=C4380C3E965EFD81079FF3A7FA3DAA8CBC961EF5 Use the new v4l2_get_frame_desc_passthrough helper for .get_frame_desc. Signed-off-by: Tomi Valkeinen --- drivers/media/i2c/ds90ub953.c | 61 +------------------------------------------ 1 file changed, 1 insertion(+), 60 deletions(-) diff --git a/drivers/media/i2c/ds90ub953.c b/drivers/media/i2c/ds90ub953.c index 46569381b332..b5896d20f9c5 100644 --- a/drivers/media/i2c/ds90ub953.c +++ b/drivers/media/i2c/ds90ub953.c @@ -489,65 +489,6 @@ static int ub953_set_routing(struct v4l2_subdev *sd, return _ub953_set_routing(sd, state, routing); } -static int ub953_get_frame_desc(struct v4l2_subdev *sd, unsigned int pad, - struct v4l2_mbus_frame_desc *fd) -{ - struct ub953_data *priv = sd_to_ub953(sd); - struct v4l2_mbus_frame_desc source_fd; - struct v4l2_subdev_route *route; - struct v4l2_subdev_state *state; - int ret; - - if (pad != UB953_PAD_SOURCE) - return -EINVAL; - - ret = v4l2_subdev_call(priv->source_sd, pad, get_frame_desc, - priv->source_sd_pad, &source_fd); - if (ret) - return ret; - - fd->type = V4L2_MBUS_FRAME_DESC_TYPE_CSI2; - - state = v4l2_subdev_lock_and_get_active_state(sd); - - for_each_active_route(&state->routing, route) { - struct v4l2_mbus_frame_desc_entry *source_entry = NULL; - unsigned int i; - - if (route->source_pad != pad) - continue; - - for (i = 0; i < source_fd.num_entries; i++) { - if (source_fd.entry[i].stream == route->sink_stream) { - source_entry = &source_fd.entry[i]; - break; - } - } - - if (!source_entry) { - dev_err(&priv->client->dev, - "Failed to find stream from source frame desc\n"); - ret = -EPIPE; - goto out_unlock; - } - - fd->entry[fd->num_entries].stream = route->source_stream; - fd->entry[fd->num_entries].flags = source_entry->flags; - fd->entry[fd->num_entries].length = source_entry->length; - fd->entry[fd->num_entries].pixelcode = source_entry->pixelcode; - fd->entry[fd->num_entries].bus.csi2.vc = - source_entry->bus.csi2.vc; - fd->entry[fd->num_entries].bus.csi2.dt = - source_entry->bus.csi2.dt; - - fd->num_entries++; - } - -out_unlock: - v4l2_subdev_unlock_state(state); - - return ret; -} static int ub953_set_fmt(struct v4l2_subdev *sd, struct v4l2_subdev_state *state, @@ -723,7 +664,7 @@ static const struct v4l2_subdev_pad_ops ub953_pad_ops = { .enable_streams = ub953_enable_streams, .disable_streams = ub953_disable_streams, .set_routing = ub953_set_routing, - .get_frame_desc = ub953_get_frame_desc, + .get_frame_desc = v4l2_subdev_get_frame_desc_passthrough, .get_fmt = v4l2_subdev_get_fmt, .set_fmt = ub953_set_fmt, }; From patchwork Mon Mar 24 08:00:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomi Valkeinen X-Patchwork-Id: 14026893 Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4B2CC25D215; Mon, 24 Mar 2025 08:00:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=213.167.242.64 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742803255; cv=none; b=TXU1bJaHuyy7vXSPcdGxvC4EBNbLtsOEAGY/Khz4Q/pbSSQPwus2dmt6h6xM+eX4eukTHnVN65ydDsiByaiQaMMJhg18QT29fLTGTt5T/f8k9GT1Hz9kUWnKjgzT4tM1oMx3SdvBlewMe/0UR8xtZsABxjPD8mOI8uKSgURK0KU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742803255; c=relaxed/simple; bh=JbU2I9+F2hIlDKUzpAmb/hFxmNDhbr1vBxG3CX9EwkQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Mcgw5oIr9iAfujkEFK7t9cNdcPUqJQX7tN36xQlFMBRUJvk62ucImPgO/lxjZ8Hf9za5nnKROKj8MD7cmO3oUr+Q8mGSO4dtgksmmdYERMZjpjRH4uuwhYfInfoHAEpDYGOkZC5E4B0Grr36ERCfuQ9DgT1Nlg20ab4D6fOTBRk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ideasonboard.com; spf=pass smtp.mailfrom=ideasonboard.com; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b=Dwy3OQLl; arc=none smtp.client-ip=213.167.242.64 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ideasonboard.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ideasonboard.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="Dwy3OQLl" Received: from [127.0.1.1] (91-158-153-178.elisa-laajakaista.fi [91.158.153.178]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 5E36B10DD; Mon, 24 Mar 2025 08:58:57 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1742803137; bh=JbU2I9+F2hIlDKUzpAmb/hFxmNDhbr1vBxG3CX9EwkQ=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=Dwy3OQLlMfyFh3bOeerphYvlVjLjKhZ3iCq/PcflslOCYTuWed15h4Td160iVg+jX C5A84JP+hugaSK3cyCQP7mtjAbUYSQxOCgZEup1g2qI+ZiakoE/6W/W2ooZLMNxDUG WFzwjySWHo6fUAQBV6cdb2BOFndkMkUq4vZdbbpM= From: Tomi Valkeinen Date: Mon, 24 Mar 2025 10:00:13 +0200 Subject: [PATCH v3 3/3] media: i2c: ds90ub913: Use v4l2_get_frame_desc_passthrough Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250324-frame-desc-passthrough-v3-3-993839a1f9b3@ideasonboard.com> References: <20250324-frame-desc-passthrough-v3-0-993839a1f9b3@ideasonboard.com> In-Reply-To: <20250324-frame-desc-passthrough-v3-0-993839a1f9b3@ideasonboard.com> To: Mauro Carvalho Chehab , Laurent Pinchart , Sakari Ailus Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Tomi Valkeinen X-Mailer: b4 0.15-dev-c25d1 X-Developer-Signature: v=1; a=openpgp-sha256; l=2619; i=tomi.valkeinen+renesas@ideasonboard.com; h=from:subject:message-id; bh=JbU2I9+F2hIlDKUzpAmb/hFxmNDhbr1vBxG3CX9EwkQ=; b=owEBbQKS/ZANAwAIAfo9qoy8lh71AcsmYgBn4REp1TYbyiosfkipAcMUhAwQae1DAuiVMEj66 edRnblzPV+JAjMEAAEIAB0WIQTEOAw+ll79gQef86f6PaqMvJYe9QUCZ+ERKQAKCRD6PaqMvJYe 9cXPEACxSLh/Dy3+V4LUykTsmYFjrMvSj48fpNaektnnEHvf0X4ws4sPluCa2GjHFWodrgSlXFY mZIMN1zMQ4uLNtUssygGPFgCUPB1sPGZoZdKf8g2/qwAhMA1Ba4RjMwBfZOL2VbkieKy3P7U5Pa bYmGP7awjqTfKhcgZIXeZB8s44v6SM3f6H1+SAbEsKuu+Tuu/sqviRkjQOkT4Y2ejovTO3MxObM B7hrfBJStYL0mucwb/AdulGoxlwIuZpGRaT70Zx1ImvfJJfF9T5zFhDdEpLNdTkdFk4yGs12egR DV0JZI0zzlj2eRuQOgpzIwo6GGCxebtS38p15OCJB9InZcvQEwjZGdE9yVtjWSx/BsL4IkcuP4G wp9fmiSLSpw3q2JoJsB7wxn88Q+guJS499Zz1LZm+WuktJsrGSVc3zbymgVsHZeYZ5LUxJ9TEzY nkpHwUaujqWbPasFZxFQValsvKcYReJ+JiR8GKuIubwiAaIM4YR+N5ikJtw0KGuAkiTxoA8Jy2g 3p2+foM1cYa9MhDGGZdYzLfAlEFU2Oto/b1qARM6KL661ffZgyHYeTdIisnInnAEnPK9PPmM08H pKs5/zaQyC/kavEvV91e7P3brQ/mDcUk91PpZ9HwkidsVLWK8p9BWA/T8JSXU/iitRXMf+7d/pt jpB7rX1UtKyoZuw== X-Developer-Key: i=tomi.valkeinen+renesas@ideasonboard.com; a=openpgp; fpr=C4380C3E965EFD81079FF3A7FA3DAA8CBC961EF5 Use the new v4l2_get_frame_desc_passthrough helper for .get_frame_desc. Signed-off-by: Tomi Valkeinen --- drivers/media/i2c/ds90ub913.c | 59 +------------------------------------------ 1 file changed, 1 insertion(+), 58 deletions(-) diff --git a/drivers/media/i2c/ds90ub913.c b/drivers/media/i2c/ds90ub913.c index fd2d2d5272bf..f3b9d2a84bad 100644 --- a/drivers/media/i2c/ds90ub913.c +++ b/drivers/media/i2c/ds90ub913.c @@ -358,63 +358,6 @@ static int ub913_set_routing(struct v4l2_subdev *sd, return _ub913_set_routing(sd, state, routing); } -static int ub913_get_frame_desc(struct v4l2_subdev *sd, unsigned int pad, - struct v4l2_mbus_frame_desc *fd) -{ - struct ub913_data *priv = sd_to_ub913(sd); - const struct v4l2_subdev_krouting *routing; - struct v4l2_mbus_frame_desc source_fd; - struct v4l2_subdev_route *route; - struct v4l2_subdev_state *state; - int ret; - - if (pad != UB913_PAD_SOURCE) - return -EINVAL; - - ret = v4l2_subdev_call(priv->source_sd, pad, get_frame_desc, - priv->source_sd_pad, &source_fd); - if (ret) - return ret; - - fd->type = V4L2_MBUS_FRAME_DESC_TYPE_PARALLEL; - - state = v4l2_subdev_lock_and_get_active_state(sd); - - routing = &state->routing; - - for_each_active_route(routing, route) { - unsigned int i; - - if (route->source_pad != pad) - continue; - - for (i = 0; i < source_fd.num_entries; i++) { - if (source_fd.entry[i].stream == route->sink_stream) - break; - } - - if (i == source_fd.num_entries) { - dev_err(&priv->client->dev, - "Failed to find stream from source frame desc\n"); - ret = -EPIPE; - goto out_unlock; - } - - fd->entry[fd->num_entries].stream = route->source_stream; - fd->entry[fd->num_entries].flags = source_fd.entry[i].flags; - fd->entry[fd->num_entries].length = source_fd.entry[i].length; - fd->entry[fd->num_entries].pixelcode = - source_fd.entry[i].pixelcode; - - fd->num_entries++; - } - -out_unlock: - v4l2_subdev_unlock_state(state); - - return ret; -} - static int ub913_set_fmt(struct v4l2_subdev *sd, struct v4l2_subdev_state *state, struct v4l2_subdev_format *format) @@ -514,7 +457,7 @@ static const struct v4l2_subdev_pad_ops ub913_pad_ops = { .enable_streams = ub913_enable_streams, .disable_streams = ub913_disable_streams, .set_routing = ub913_set_routing, - .get_frame_desc = ub913_get_frame_desc, + .get_frame_desc = v4l2_subdev_get_frame_desc_passthrough, .get_fmt = v4l2_subdev_get_fmt, .set_fmt = ub913_set_fmt, };