From patchwork Tue Feb 18 16:15:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomi Valkeinen X-Patchwork-Id: 866317 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 7AB831ABEC5; Tue, 18 Feb 2025 16:15:59 +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=1739895361; cv=none; b=Yp26J+jbHrVFs4KCuPopvgUFqgRu7D7jhUYYdwC/z49DjDjx9pdiHcafGRHqJz6H7hg45FcdOWNSolo65hmhMr+YL/emMN+1UzGy/zIz7SgLoy3Sn3N0rlIwIfEaODZlUj1uDnEWA9nW2phJ35jMj3emQcZIX+7fp8rX4H2UYoU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739895361; c=relaxed/simple; bh=xm1LX+Al9kkNJP4WHSG1A4aBX5Q0NSz2MZYYWtl1FHA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=M8GVhpLNmdt+fd8Ldx8nmJ7UHUvFWPPUl6UOMC9xO7pBsRG5gOgv8YJeCjAfoo8RK6BXMac6AzSOz1pSbWazeTyb+3ncXt1silWlnspzHOzZ+CSQrzU7f58jrxC3i3KjSUmmLDvWjD4DuGNPtxMx/A1DhpgBjF6Vo4aeifux9I0= 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=t2AoU1Tn; 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="t2AoU1Tn" 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 4966763F; Tue, 18 Feb 2025 17:14:29 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1739895269; bh=xm1LX+Al9kkNJP4WHSG1A4aBX5Q0NSz2MZYYWtl1FHA=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=t2AoU1TnXCJyIOSUffiwdbRpyxXGzdwiQg1kqxAOWp4tEUGMp9apbLbp98jg56JCm P7QXS3ag5jRgQozzblEhHDi1O+iHpHZCwQkKsxbTr2nMknhWLagfbKyu1KPSh40/2e qR3hBOqUSkJVTRwSp/m0//7T+btxj1ksmcFZrbJk= From: Tomi Valkeinen Date: Tue, 18 Feb 2025 18:15:43 +0200 Subject: [PATCH 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: <20250218-frame-desc-passthrough-v1-1-a32458f53714@ideasonboard.com> References: <20250218-frame-desc-passthrough-v1-0-a32458f53714@ideasonboard.com> In-Reply-To: <20250218-frame-desc-passthrough-v1-0-a32458f53714@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=4815; i=tomi.valkeinen+renesas@ideasonboard.com; h=from:subject:message-id; bh=xm1LX+Al9kkNJP4WHSG1A4aBX5Q0NSz2MZYYWtl1FHA=; b=owEBbQKS/ZANAwAIAfo9qoy8lh71AcsmYgBntLI19ZAUPpNwW08wW7t26oiO+kPyaU0APgQq2 tKLQgg7+GmJAjMEAAEIAB0WIQTEOAw+ll79gQef86f6PaqMvJYe9QUCZ7SyNQAKCRD6PaqMvJYe 9WyxD/9ywjre62km7nzShd7wd2p/76C37ufemY+je01FsD7WCKT/sBMayDugvFQsq+cUFb+LyUu 7RVbTnrXyLMavZXfmO0TWEZKQgQjObDkuxjfAQt22NVpgajvfd9HbS3Ghy4J37Za+RheDBbtVRU d2mZtgFVDm4hiEXioCWCAin5LbgWSU0UkOzsH3hcvUdmY5b6CInSXOmo2oNHCq8aykyNrpmOPPc cbI0eQyOrYyoPNesO9sAu/ZjniQ/rKbaR4giVNzsDEWEu/4pXIylExvTh/i8QaA8YtXcuxZTe2G d1yqyYl+ZZSqzWsymxslbBmDPMiIeFVprpQ8kzq8xDagrS3teXqaq0K+ml0m4TxIxgYFrQct8YS Nkq4/dWjfhk3St+4CtD+iqlXDEZokoCb0YkEu27O7mS0cnnCFecHs+0KB8EjWuxRtvw2/web+od k8Wuv+268bz/a29IGQcbiCcinV5ha1fNVnI78L9/VbatuFJ8D+hjlzBuG9KaoNtmxk00F7R3o4h 72IUZqz0+3gngC/pb5RM1mKGqsItAiifMvkv1TRcqRztg0mpEXni40+VJObC51qysQhsOmeB7WP yaOb7Zs6/QJE9v46iEqIAsDY0iSZq0wF6AcENlriViJOJ8L+Sp+49pVFeiVxW43R7KNk/K7Lfza zfJGFAt5SlR7eDw== 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..f04de851d777 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) +{ + struct v4l2_subdev_route *route; + struct v4l2_subdev_state *state; + int ret; + const struct media_pad *pads = sd->entity.pads; + struct media_pad *local_sink_pad; + + 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 Tue Feb 18 16:15:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomi Valkeinen X-Patchwork-Id: 866631 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 A720626E65D; Tue, 18 Feb 2025 16:16:02 +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=1739895364; cv=none; b=HnU3t+DvimuMmosEG0C98f2p6wlkP/Brpw3w2YedVSz7vUzV9ZmxgtI/eGVQ5u7kj8V2uO/QKd8YQc7NDUa3B+E0fovsU/ywehEx66YlulKxFe6LYtsHzQvGQWw1q+MGmDWPJt9Cy80W7qi3aUKcYBDsYy5D16G1SwgHtRgOSAU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739895364; 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=AqNR6ak7IMEzU+2ZibJKqZRO2ilzxCXZZ+7N97WaTl7HKSo14kMBQlN6wnoxRPKplBKom7oDKReySvNReWIwEJc0UjtLJlWfihzLMSIuHjRnXxQcSP7Jja69+3RIu3uwuqQ5wsKjfEzbzDzAHa1akdApXn3rBQmxLAoP5oJuoVw= 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=cEDH5VYj; 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="cEDH5VYj" 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 C254C8BF; Tue, 18 Feb 2025 17:14:29 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1739895270; bh=oeUCSWR9CCrCrP5eG3cO6wj/6eGU83kC+RAzKws5f+Q=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=cEDH5VYjrmuzeGoQz6ycPXW+2lfo+OVGzp7/MPIjOkrMZ3xMmbCZzcoAF2QZ2xC8H e8FoYPVIneO9Lk5d2oFCpm5Qg+qMUebimIsaAeIf1pERiT1d6z1O/z+EkgLopZYQsm FujtDmJFiaeAaaN49lEgkyE0h0yf8P5maab3GSzU= From: Tomi Valkeinen Date: Tue, 18 Feb 2025 18:15:44 +0200 Subject: [PATCH 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: <20250218-frame-desc-passthrough-v1-2-a32458f53714@ideasonboard.com> References: <20250218-frame-desc-passthrough-v1-0-a32458f53714@ideasonboard.com> In-Reply-To: <20250218-frame-desc-passthrough-v1-0-a32458f53714@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/ZANAwAIAfo9qoy8lh71AcsmYgBntLI1FHpVymdpu7dBWZidfAH4HQ6qjxZ1HLGqG fjYQCtvgASJAjMEAAEIAB0WIQTEOAw+ll79gQef86f6PaqMvJYe9QUCZ7SyNQAKCRD6PaqMvJYe 9YvnD/4nhBeP0lE9LL5P1AUoL1b/1Qt+VzXGC57MvIcm3PRIeGxT9yayuP6xBuE6yKwlKB0MTX1 ociJr3f37AKR5B567Bg+4umeEbyZ2RWYS7c1MA2x+mMIwi61x9wT1L8maP1XjfIjbYKXCcGD2Do q582t1LMX6H3q4yT2sFc+5DJ6DRJXT5PGyPaeuczwJeo6z6TwhY7jUhP0zrWFD5CfCGmBZWIyBq GQn3CKEYl9yg7Fljl3k4O2hDayXRXl7yjjnlSoT2y6sQtaPX+z1SKBwoTbj7KnwvZW9jl2CPuYn RxSFEB8BdpwN3OTsGojNCcPqGaso4Pt+Aaee/wpEJha4iQd5ibnHV8dq7FjB0Dt8xdF+fPprvLd VyT9neD84J3mHraz9Mh5R+/fwwZME1/csN7NChFlxXAaKkxcGhG6/x0Ws7oTh2OtPWQqZXyDzMS t0QoKVpah2fBjEga2GsGVAJWa70Bjolg9LvMuaHHz0dE0MbGsHKfIGjC/WzDuVgPr+x+TROBw8x 6jWr01djv6J0ztxGRkY8C5SPWs5a114sgK0Phs64S4WxL1tpznKl1IeJnX9X7PtwqkBDISWNqb1 llotpFV3Y77+v6DGIfBvSdgiZwbgvDkBgXgG0XziwNEoDfdIEzpbovmsg15DmcKtn0dFGRbVl2B s51+lWvqQM26DbQ== 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 Tue Feb 18 16:15:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomi Valkeinen X-Patchwork-Id: 866316 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 5989126F44F; Tue, 18 Feb 2025 16:16:03 +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=1739895364; cv=none; b=ce/xpnpWLFYdoKOuaS7pGfAhi1xdZSCLlwSfK6QAR3oAdDKfAiG6tZVKvipXCFFxbhpgYry6shSA14yeu11TXgnHOJ8O+xwMPbreEJSEThedZKjtv8LDlDPEPuszum1ADX5vcyngMddIIoXXXP1gi7i21cAvJEtKtCZJP1gN4pw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739895364; c=relaxed/simple; bh=3aGNDO4JPGcz2XPIJhdm7F9SVuX+jTc81pEhyWCKxhI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=fe0jMpHLLiuPafZqWIqcoLw6RMIPuXsu+IRVOJiHZunDGiE2dbrNWLLdkLlHGeYQup5S8hq/pTYjLpaed6/cF0wx9tzrvIw9OtVIo5PYzmdrs5sY6sf/4ItA4+9CNjasXHqUaE3iy0J2Yjx9sQH927JZvyY/JANC1jbuWXlUQ4I= 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=gjIwmzEO; 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="gjIwmzEO" 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 4482D11B3; Tue, 18 Feb 2025 17:14:30 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1739895270; bh=3aGNDO4JPGcz2XPIJhdm7F9SVuX+jTc81pEhyWCKxhI=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=gjIwmzEO1uZhW6pDh5xLgRLSclVd/TqvKdDUAmiJ1ZSsqsQH88mYygZJjRpWZjMK+ wBFHJlLtJi51oFNSoKYfiUomm7l3/drzTc/ovhMtI6cVdA8DqH2oqbrA+lh9xfeSwx P2KH2qTgrkv4hJZfO1JYb5P0BQD7POXkKicZpR5A= From: Tomi Valkeinen Date: Tue, 18 Feb 2025 18:15:45 +0200 Subject: [PATCH 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: <20250218-frame-desc-passthrough-v1-3-a32458f53714@ideasonboard.com> References: <20250218-frame-desc-passthrough-v1-0-a32458f53714@ideasonboard.com> In-Reply-To: <20250218-frame-desc-passthrough-v1-0-a32458f53714@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/ZANAwAIAfo9qoy8lh71AcsmYgBntLI28ANwKJQokEh7xxdkjn3nkeg60xVF3Cjru 01VvcAxb6mJAjMEAAEIAB0WIQTEOAw+ll79gQef86f6PaqMvJYe9QUCZ7SyNgAKCRD6PaqMvJYe 9TWBD/kBbmglgL+bJymB7/EInkgH2b3/ZmxiFDs27ybq0xyzuLRwVm88MB1UttgmDUE5dmZExDr oyhUanOfI6a4ysIQzVrP1aHynz911fOIqFsF+5QWvRr3QUOLkjEc8gU7ZxZ+LBOh8VNBb1nGdIc Yal1s1BXnz8LLZfPNUYamun6F28XTRv/SD2sEPxEUTxPBfZcDjlXa4LCFb4F8NinfAjUr4JiGJ7 HAYsK1wyce/WSlGst1wIJhDwwcXGdYoTRNJxsKC5Mq7sfqgLQA0rYdNWYjd9ceJB1nOVcxnSiWT bmcMDRk7gG3XoeZ3gJ4AMmM9ZRRwPWW5VmcrYS4VgvPgb1GlcTTvvJ9IEfCe20Aj6EDdc0LRx0N suB3+OPjs5VFk0DEFo/kVPY8/efSMPC/N+DQHGnBd5x4oFu19ou3HCoIPVK9DpvADFjR194Flwt RiTVT37DMAcUFS1cFhvAKfDQjdJsxk/t8MQsho7n4cQQDrGah/vXa6HBNvMuSP9v+Vu1g2cL/yn GuZRj2Fn91lx59IPc+mNZ/tkuBMmikTxMhcQHB0TVquzlta6HaEA4fNNnl6qwtp5/VQnDoiqhv8 cs1VNHzibiCyrEfDbxT6aQtk8TZFepT4pMTEfhcqRNPj/sZ5Z33FcwdSYqF+8LBl1gf4ZBKX+Kv Ig+gogsE0/zMVmw== 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, };