From patchwork Wed Feb 19 09:44:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomi Valkeinen X-Patchwork-Id: 13981852 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 CFC211C173D; Wed, 19 Feb 2025 09:44:28 +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=1739958270; cv=none; b=Xu7XmZkXErIMmmQkbDfabWuxV0eNg2cxAtiIJQhyRYM9GLq0Z80QjI/v09V35TMNZYjcCK6H/ewkRkvZ/EcLGFXUS8Vy6Dwd5h9xCMP0TrBFc64r/okfgizWWpIxakMxZw3k1LrNr3mqonpknlQ/zILuhLjoaCSfQ2URRwC0pT0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739958270; c=relaxed/simple; bh=gncnU/AtYxkwKrIf/446yLEgI4yxVWNbl8XMX/HLsKc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=MJlexko0u2YjoqetHzev91VKTtB8JQxtXRq2PIXigaKWbsZvwOAkVVcGXCwNRB6FBI7ANBLMPV6UMw7plHbuc3S3IJA95MlFjdVuwFAV5LqEof3LXc80dqAGeIIRqv2RTOALGpNEZNpLcjgaau94HkDpmhXGb0LeeXCnyc3b+4U= 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=tQaHyekA; 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="tQaHyekA" 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 7DDF1514; Wed, 19 Feb 2025 10:43:03 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1739958183; bh=gncnU/AtYxkwKrIf/446yLEgI4yxVWNbl8XMX/HLsKc=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=tQaHyekATzbCkuAAPqI5c7NmqNADxYdheTXX2TBMybaqoJIFSFs0qiO8dqNQ0gXC5 Lq9bFRbg86siBe+URybpbky6ebnoWQCnASLvjySrFX1XuNxBJc7uVvQqyrtOM9SkNZ 72m/xqqHbodpTqlMsOM9u8IcFhx+goZT+UxFKWL4= From: Tomi Valkeinen Date: Wed, 19 Feb 2025 11:44:07 +0200 Subject: [PATCH v2 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: <20250219-frame-desc-passthrough-v2-1-5135d57ecd6a@ideasonboard.com> References: <20250219-frame-desc-passthrough-v2-0-5135d57ecd6a@ideasonboard.com> In-Reply-To: <20250219-frame-desc-passthrough-v2-0-5135d57ecd6a@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.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=4819; i=tomi.valkeinen+renesas@ideasonboard.com; h=from:subject:message-id; bh=gncnU/AtYxkwKrIf/446yLEgI4yxVWNbl8XMX/HLsKc=; b=owEBbQKS/ZANAwAIAfo9qoy8lh71AcsmYgBntaf4V/65ak5LTln4Hu8UZEX9EACZbKp/pcYuc GDlRKMu25mJAjMEAAEIAB0WIQTEOAw+ll79gQef86f6PaqMvJYe9QUCZ7Wn+AAKCRD6PaqMvJYe 9VHcD/90CuGfB5YqCSbY87PA9anGgdZGbpBIYdpSu++br7fL08Wne35jsLx/Gam92MpPHaTBMv0 IZP5LqSmo04j1XaqCgymoM9flpEDmTHEQU6KSjRIlzsuQmGjpKCU12tLFx4NzU1wXAaPnf0hzV0 lkTpLAmInF+XDgc4Uie4bj6Xg67fAW93hk1Yj7Wq6+QrlTs1RgpNGN66m5dCs5TZFtQ3D+7jBsY 8enTCPJ48cWaxYVJTmUZX99XEH/qB/sMNye4OsXSdByqIcygnjSza+Zlp/Dmws5tWrQEEQbLvmz UB8AGjO63R8DcUl7AYPeRaxN/m36kAFTNCQkpSQ54xt0f3KIhWiQ3UZL7/xclhiOstPMfzXzShE yesWYwlvhc2DqXPxgoSw9qNnC1mvH9Yuc48mzaRzD0wdMEjX/C9OcwWWZSIUg84LQNT8K6lbrUy gTU5ZGUd392s9Bgzhxr8aQeWJb0/igpux3MxcLx1KP3LYWy2+7Cwda8ua3l/58qoyy9+XCQqTkR zw2DleYEWe1EiuPcWFVkS58nRFD8dnmIQ4oyCIxMrLgBqXgr6mZknYPV0JrWDTayX92HjumnxpX UauR+r0GEJd+9i8d4PVd6XDDCOKeG4Ab3a0kFSq/W33ZZQnPYeA1BX9QFsTRNuTyjqC1r3Qho1k G3uqBtbqbgi/wjQ== 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 | 96 +++++++++++++++++++++++++++++++++++ include/media/v4l2-subdev.h | 21 ++++++++ 2 files changed, 117 insertions(+) diff --git a/drivers/media/v4l2-core/v4l2-subdev.c b/drivers/media/v4l2-core/v4l2-subdev.c index cde1774c9098..978037b84de4 100644 --- a/drivers/media/v4l2-core/v4l2-subdev.c +++ b/drivers/media/v4l2-core/v4l2-subdev.c @@ -2500,6 +2500,102 @@ int v4l2_subdev_s_stream_helper(struct v4l2_subdev *sd, int enable) } EXPORT_SYMBOL_GPL(v4l2_subdev_s_stream_helper); +int v4l2_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; + 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; + unsigned int i; + struct media_pad *remote_source_pad; + struct v4l2_subdev *remote_sd; + + 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) { + 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) + goto out_unlock; + + have_source_fd = true; + + if (fd->num_entries == 0) { + fd->type = source_fd.type; + } else if (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_err(sd->dev, + "Failed to find stream %u from source frame desc\n", + route->sink_stream); + ret = -EPIPE; + 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_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 2f2200875b03..d42fb3f55515 100644 --- a/include/media/v4l2-subdev.h +++ b/include/media/v4l2-subdev.h @@ -1746,6 +1746,27 @@ int v4l2_subdev_disable_streams(struct v4l2_subdev *sd, u32 pad, */ int v4l2_subdev_s_stream_helper(struct v4l2_subdev *sd, int enable); +/** + * v4l2_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_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 Wed Feb 19 09:44:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomi Valkeinen X-Patchwork-Id: 13981853 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 16B8D1C831A; Wed, 19 Feb 2025 09:44:30 +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=1739958272; cv=none; b=sZp37T2uD0Blgx3uXojqaHvg/yqlGTAXHtHrJdJLcQbYOaVtzfj11c7uZR5xbd+1bxhWrsjc6NEWnaEnSvv/oiNTy3ar+InvivmLOWgn1xk47UMyRRCpxQrFM7KUKFOvuRBPux0KeQIrrTI+E9PAXUlJhC5ybKkE7kP90XkW3Gc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739958272; c=relaxed/simple; bh=oeUCSWR9CCrCrP5eG3cO6wj/6eGU83kC+RAzKws5f+Q=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=uJMx0nyoaJrAHkfVj1bW7A/tNlfGB87mE03rVTRkRJ4dlZTDJpZAfl9YYHNS3Y8+fQghLn82tvy6Gvxe1gdJh3xhGiXeN4u2WYXnheyB+2WTLjSYWreuit0QT3pHw389QIZsLg3gg0wTyGvJJkDxIuHSGbwxbJxVviVzCUvFuEg= 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=k8miZrTT; 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="k8miZrTT" 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 03D2DBEB; Wed, 19 Feb 2025 10:43:03 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1739958184; bh=oeUCSWR9CCrCrP5eG3cO6wj/6eGU83kC+RAzKws5f+Q=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=k8miZrTT3k1mf/aLSl+hxnzBsFmoENK0iKIwV2bH3HgUimN8UNVTEqh9dMeouNs2p X3R+m57hPSYw1Zio2Vtj8SJkp4VidnCkPKY1D0J9OUccXxG8to7fkfla8u3dTWoAnb nvFbFnPujaJ+36y45lNMMbMvjz7fOSf4q5qtte5A= From: Tomi Valkeinen Date: Wed, 19 Feb 2025 11:44:08 +0200 Subject: [PATCH v2 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: <20250219-frame-desc-passthrough-v2-2-5135d57ecd6a@ideasonboard.com> References: <20250219-frame-desc-passthrough-v2-0-5135d57ecd6a@ideasonboard.com> In-Reply-To: <20250219-frame-desc-passthrough-v2-0-5135d57ecd6a@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.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2727; i=tomi.valkeinen+renesas@ideasonboard.com; h=from:subject:message-id; bh=oeUCSWR9CCrCrP5eG3cO6wj/6eGU83kC+RAzKws5f+Q=; b=owEBbQKS/ZANAwAIAfo9qoy8lh71AcsmYgBntaf43ssz0i6fx0J4CLSv0AOvF3NQhKWvLe+vX 3If6t3II8qJAjMEAAEIAB0WIQTEOAw+ll79gQef86f6PaqMvJYe9QUCZ7Wn+AAKCRD6PaqMvJYe 9XiGD/9CNGJY9DDuG4RpSwNcuHYDA5zmjI253as2dME5Ejo7zD0vmwr2/ja+yhsLqwbJybRzU0I YklhxpGFLyRxNFzTGvP2aOfEztBjV8e79SIKKSxfrzXgV/kO1HXBXkcXHjz6BXhu3a+y/HeI2eE sgeGJ3+4nVw9dIldtVIoEChWmgQ+kRVAkpZnJ4ML4CflkAdTs3e6hauzI9I0B/MnzW+WI3fonjH CV0lMSLW+QaNTucMIOAd5Xgp0C2PVbNJ8YhfLDMu3YXbIPvkXWaTZV08lOIVhfQ4ZIHWbunX2hk 3PJEgoEyOzUyj9vXQw+OwvWVewqsMwbmybtZc7nFPvwAf5V1XOrjWvssOV7JEHsc/3kZ/g9whET hdO2LJxcA4rMj5Mn4TySndCEVGBW37kznn/OPPWsEGrkHU7tgmj4ZaVDj2PIsL/rwZG3ALfX1SH 8z2bKOXBKwNzdnhYZweoBy2fwV3GEzq7iz5hBMujgdcsdQzp1Ecybci5HsH7ddTOm9sj2rX8HsY r9kbJzACBjUSLJjUY5pO06huek1+/6X41KET72Bi7M86wLUG7h80Lzrihwdx4vYjllWkmCysfcP 5Iara0IUq8rQNV8D5Uh1iZCUrHwmoAcKvBFIKDFU+TaFPbTGaFvkezcEpfTadfG+/fbiL2KHgU+ AklcOnArDHd9pUw== 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..6622a150f802 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_get_frame_desc_passthrough, .get_fmt = v4l2_subdev_get_fmt, .set_fmt = ub953_set_fmt, }; From patchwork Wed Feb 19 09:44:09 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomi Valkeinen X-Patchwork-Id: 13981854 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 2560F1CD213; Wed, 19 Feb 2025 09:44:31 +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=1739958273; cv=none; b=qAxn2Jjt6vfuZc6Ct1vzTmsPh5AqEgx84qbp0DkMiPwXxfKDAwRuhTsqwpktaPuDucNl2bCslaJnBBZPpSD8PIPEOnH5+l0gwWFC/3Y6mbmWjUreriq+6x66A6n6oUZBXgB/GGjiOIY3L9RQh/OaH/v7RQ0IHMAtBaqh10ln9HU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739958273; c=relaxed/simple; bh=3aGNDO4JPGcz2XPIJhdm7F9SVuX+jTc81pEhyWCKxhI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=YuhrSW+QiKlNtUoi5l7e62FyjD/k6pMB/+DLr/pnip0WcBmeZgZScKXgI28Lrsnkm7potvOeRpqqp+oX/2ZJtNhhgS6XWSzHsEFkE713w1RKyL4HDHWLfpnMtindfwkmH3hzB+vm8K9ThJtn/67jN6wKVyk4ei5dkoJMm+O2tB8= 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=ook6ip7K; 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="ook6ip7K" 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 7C6EED21; Wed, 19 Feb 2025 10:43:04 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1739958184; bh=3aGNDO4JPGcz2XPIJhdm7F9SVuX+jTc81pEhyWCKxhI=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=ook6ip7KEZmPutIEMqsGQficvTdxqcrR6VZggTSxlZdVjEEauX2We9C16073Q0hwq iTyjjlBsrYb92k3YY1H+FFnIde1nYciwmlEWRAL25bFTfq6uGHauPgmBxnZJbVQGIa HVv/mvDsnusQuJk3qzbepdzeoDrKjrikXchdK9iw= From: Tomi Valkeinen Date: Wed, 19 Feb 2025 11:44:09 +0200 Subject: [PATCH v2 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: <20250219-frame-desc-passthrough-v2-3-5135d57ecd6a@ideasonboard.com> References: <20250219-frame-desc-passthrough-v2-0-5135d57ecd6a@ideasonboard.com> In-Reply-To: <20250219-frame-desc-passthrough-v2-0-5135d57ecd6a@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.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2612; i=tomi.valkeinen+renesas@ideasonboard.com; h=from:subject:message-id; bh=3aGNDO4JPGcz2XPIJhdm7F9SVuX+jTc81pEhyWCKxhI=; b=owEBbQKS/ZANAwAIAfo9qoy8lh71AcsmYgBntaf4z7ZLOrBGD/K17IhmUXio4xWHAQT52VRq0 IbUyql9CGiJAjMEAAEIAB0WIQTEOAw+ll79gQef86f6PaqMvJYe9QUCZ7Wn+AAKCRD6PaqMvJYe 9aWwD/4g4IdEzXw9peib70gAmY3Ndm22YVviyzgRWtez6ZntuOwlUtM90ZP9LT6+z0cmSyNEca9 hPEyt3d9F3C+InY1FCVlzwUbHClpeDAc/oUHt+oJMjopbAKXk80SCIS5Fu4Ag1D4zO9vtLC7Rzg rxoFzoyjNQZBnenfsSIPafGBs5HVaGx5Qy/yS1LoPXxoYcbIHki/LVCPSpNdVPQfZPombhQ4mjz UE50QVtQxY4xuihyrJ6El6ZJhskVBmQxTzb5gy4LBi+i79P7WUHeHlA+hhW3WAyOe/Z0d7gBBgq 4JuTgQUwOdXY0GsFd1eqFXMvrvxPEhz5nJJ1wIcys9d7u7OXnRJUnDcLCDAPCBwDqV+a3xj+UXR YoU1pza8jTzOLeHEJ1upBxcafmjk9JwT+YVzuN4Gv5kakIkCc7IcD/vtER3yvd+LnXOzcoRE9+N btt2V8n804o2pdZNMg2LMZGycB5tK7B9Kiswo+g9uVL8W0KYl+ETN/QzIblc0JhW3De3FQqYU4q mP9wtADl/rMVrwdL6VdTuhWndDMMIEijZrRU365FqbH+BvQG2rTb9hJ0ICe8gNno7CaON2U74lG N7oUZTmLG6j6/pGKCXWY8zpDqgeH2S0ju109pjGtrn77Fs1xbHBOUJ2HKzWd10nSrR6th5mEN0W QI8p8TK8YU+m5+g== 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..9ae761d7e3a5 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_get_frame_desc_passthrough, .get_fmt = v4l2_subdev_get_fmt, .set_fmt = ub913_set_fmt, };