From patchwork Mon Mar 24 08:04: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: 14026896 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 7B5D32505C3; Mon, 24 Mar 2025 08:05:04 +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=1742803506; cv=none; b=GYqXcUrtRnB3D42eQlvw6NVGOEd2e/NBZb0+X2TQq6CwQXNRZM9lCb+yKhzIfOxmRsWj/T+CL7fyElJSXNawDgIu+awtlSXQ+CiXCDWpXvCijaI3dRE9uJ8/oS7JzvOwZ4dsNSjM7i5ZLF0c2OBsqKzZELUBjFLq+JlZsA+ZrPc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742803506; 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=MD8hF/AXJt2lUQZqoZNjpOW0AljYtDPT+t5dMeyBgp77OpTz28jd/Mfjj80MxeuvIWof1mJDrFzc+TLpWMaZeJ+J9vVFSx1KP/52G5w+/FgFuIaiN2CUNtZzvV5lGi7niOG5XxMyKHcjg7KqnIKd/rfbqcaDdBV2CnSbRI6KOUI= 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=l6wgHDvx; 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="l6wgHDvx" 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 D8CCFA8F; Mon, 24 Mar 2025 09:03:15 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1742803396; bh=2AgGgd3+UZKSFw+Wwgnhw/YNDPJkEftVNvUe4+/jQ4w=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=l6wgHDvx4uZIdF10djav+nPWJd8iUHTbLfg4oqZl8PTk91ozwzCAmRTiz8yDxauV1 gzjeE07zrimlWEUFu2a0MhBh3G/Ldd+3Lzzky0u8Tur0gO/T7M1n96Bj2xruSPDx2t uRTX8Tr9JcQU16UmBrpmvVE24QGHnAXSebzRYMtc= From: Tomi Valkeinen Date: Mon, 24 Mar 2025 10:04:44 +0200 Subject: [PATCH v4 1/3] media: subdev: Add v4l2_subdev_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-v4-1-dbe2412297cc@ideasonboard.com> References: <20250324-frame-desc-passthrough-v4-0-dbe2412297cc@ideasonboard.com> In-Reply-To: <20250324-frame-desc-passthrough-v4-0-dbe2412297cc@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=owEBbQKS/ZANAwAIAfo9qoy8lh71AcsmYgBn4RIsw3YEQ6HvroWnZ4Su+6GFv5+FPGD92O/6M WntCCh6TomJAjMEAAEIAB0WIQTEOAw+ll79gQef86f6PaqMvJYe9QUCZ+ESLAAKCRD6PaqMvJYe 9ZIHEACcdCg/na0iXeZuRbUHETP8yH5r4wEwDWySplTwDCzmopah5bOg1BorQ4VRCch71u/jZ0o SD6oz8bY4japqQj5Sbd948QdLYvaNQvKSIbrk/idSH63Umw9sAc4Ebn09RbIHMANEtKRpwDduNx MIRyrUspsQl6lBRZJuH39H7kLzAL/nvrhayDXeJvhFcySolnIviC85Tf/c+JKcsXtLqWbxlTY8y qPz+CizZJC2GV+AjGmUuH3weD0kjDW11tjkzuKecC7AazYLdDTy78NR6RypxawWEbn58MsAXx9T Q/ItvfX3cKrtb7FMgbneZP5aeQwknMUmCvXsDAkNDWenIyGQulB82ITFeyb3N/GqbXNFqzu5Sos o4G3d4/Wd3i272Nqy+2WIBt6myW1Mj/yUlPzo9VA+Ro6OWFu2QQebHvJOoD6iLyA7w9vOfd+k8t HfAOwbsDw1uq3x8JWzt+MjCN58v9guWM1noR5S+DF+sffUjT61XXppME9V9w8hcQv75jaVfSAHc WufS+uLLfmbDsafz+VQd5EMZ20Us8anWy5NyKR6DPqFKipraJ5J8BISnv0mnVl5iLZHkpxBr0SB NzwhcMsChbP+5roYo31T6OFd5jfScOsfkGo+VkPdVdwmhCKGPZ1QHGSu2YmWX+IrYcDaHx0W/mU fgLzNXgRJ5/ZYOQ== 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:04: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: 14026897 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 B362825D522; Mon, 24 Mar 2025 08:05:06 +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=1742803508; cv=none; b=dsWVi+eCMSHH5NTI6czTyUxbl1cnlifZh1xZ2xCnZJgW8sqgrIWuqL7uWIiNy5BJBV/6LwL5QO6CBva+5JJhXXTUkS9o/C0fGNPFIphtAD+uJgmO3VOTqM3/RrdILRicNFy7RNngQq0qplclzaCJ+2tjZD6nIVwjnM9lk/5T+so= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742803508; c=relaxed/simple; bh=EwtCfSMyC1bK19UIOk34q1JdivYUQPm+OZei5Yp7ZCg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=BMbK4f+HhkT3Z49Fz2t3Nzw1ERIBQc+EopYgazy0jOYfTvnZJfxygivYO3mifjYfmMkncbrsLMAnAGFuLQoBYmtaj3WrZbBWUdnnKul/I+dHPdgFkqiyFT2ETDTvDtMIaYoB+nBVOD5Jh91wpKPxyA+DWsaj/DfD+1JX2Ej64XM= 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=gAOR74OT; 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="gAOR74OT" 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 594561059; Mon, 24 Mar 2025 09:03:16 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1742803396; bh=EwtCfSMyC1bK19UIOk34q1JdivYUQPm+OZei5Yp7ZCg=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=gAOR74OTJX+dJ3q3EHNcUwGczhV4Bsm4Rqvsbr+4/YzDrh8zhFwJA+SIaPe7njqk5 RZ7kHr9sr5Rw9vP9m68IOK1b5GaF5G7yHZ2X94ubXSo4B2heD6lm2wsQ8051Bmg7ie W9zsuI3kdvtuusZrBg/PDUcyw0eXHxwBm5JE/r7Y= From: Tomi Valkeinen Date: Mon, 24 Mar 2025 10:04:45 +0200 Subject: [PATCH v4 2/3] media: i2c: ds90ub953: Use v4l2_subdev_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-v4-2-dbe2412297cc@ideasonboard.com> References: <20250324-frame-desc-passthrough-v4-0-dbe2412297cc@ideasonboard.com> In-Reply-To: <20250324-frame-desc-passthrough-v4-0-dbe2412297cc@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=2742; i=tomi.valkeinen+renesas@ideasonboard.com; h=from:subject:message-id; bh=EwtCfSMyC1bK19UIOk34q1JdivYUQPm+OZei5Yp7ZCg=; b=owEBbQKS/ZANAwAIAfo9qoy8lh71AcsmYgBn4RIsaoTwrUKPNgTci5Ivzka+6jPVZnRt0c3fn AxhLH7FKjeJAjMEAAEIAB0WIQTEOAw+ll79gQef86f6PaqMvJYe9QUCZ+ESLAAKCRD6PaqMvJYe 9fLsEACrlTGE7J6rN5mHRsYSftoEm6aZBZyyH5V6TI3U8XHB+AU005S2goTY/kwt6j8iFAegk3p cMOjgl803EL8bM9d6nmsPsmTrBUOM3fcZUbMD5+S3x0PdtdXmG8I/A3hH4MX4iHM2yumBTWR574 iMUdo8o3lbp0ClKU0RhGxEjnR3OrhnMgoDnofztWdES81yVp+8d135Qz4F0OTa7ZW6bBqlgb+sU G2g49DO7ziMp0FctVlKiRZSoOiLFVZV152gwYeYeVA8uyy9ZT082sqgugHklhsoQ2xxg0R572Jp aYvRH37lf9/u4uRP/7GPKLKVGvWH51LblAWPo2CL6D5j9GyN/7rVuKZ9si5msIT7PsuACXYn8f5 AyZQwCidpHsuh47Ug5PO6ANZc+iJ/JQwl1V8Qg1RPnk4jDTrtGEyxWgfJAiKLjmfrRoC+Jx0/a3 oAaE26eS3/FKf/r98q7UYDGj8YsJeoC5w0guTHjcHW6lWOJRGxFzUGvDEW+2F66m9xEW9poHqpJ HbnMCp6rPZUw5q0TK+HMPTcGAayioiSjphD/seXwckCXMKR6Nqvucvttbxs0+jdgHfFR3tadyZr +zKl9a8zGgilmK5NSaNyotveNqs1frHCK17TaIgYuw7umDpFMHcI839stRtQMpZfFuKQruQEhaX rTmAbHSz0OLzeSA== X-Developer-Key: i=tomi.valkeinen+renesas@ideasonboard.com; a=openpgp; fpr=C4380C3E965EFD81079FF3A7FA3DAA8CBC961EF5 Use the new v4l2_subdev_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:04:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomi Valkeinen X-Patchwork-Id: 14026898 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 B699F25D532; Mon, 24 Mar 2025 08:05:07 +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=1742803509; cv=none; b=Jhdt1oIRu8sBFaBAQ1RtuR8WCIKKoH8WqLfOekl07dVlmHWj5q70DCjgZoSkmrEuLWI8MEK4CIBPwv1WXs3bvaVx8N7/Mb4TNX1rWdECVdPyvgzRyp8iAAzp/y0+LZyHisaUjH5wsmEWH4s2ABlgEVnYnnh0V+ib8VjiePd5e6Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742803509; c=relaxed/simple; bh=CW2HMs0XwwdWNF0z9jeJT15ET7DbR6dbxCPOb57gTgY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=JZDCdgMIx+JsVLWQkTDCIhOuhzPyb1A/S+iLyLdkkrl4W4fCa23cog+zvvnEG71I9pW3AB35AbxotX8fSt/pDvlxeN1QBkwknbths6rO7UEsz440cmN9EMlXVGd/eVZKq+Q8/e20XKFzvFrGgko9mkjMUz7tg8c8jvSoaauEd+w= 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=qubhuNz1; 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="qubhuNz1" 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 CD9F410DD; Mon, 24 Mar 2025 09:03:16 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1742803397; bh=CW2HMs0XwwdWNF0z9jeJT15ET7DbR6dbxCPOb57gTgY=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=qubhuNz1O7vm9OLTwB/ck3S/HfuYsRk9dGn6UMXYdKMOkGmUUfhJJEZenY9ja00Yg 8H1Hde5YgCxBJot+9+vTzDk0b0/REca/RUU1X78iwjV7kOHk3lr4rsaPsLVCgmM/Ap M+JLqgeV2XTJSpkOaTYOjuxDwvR9mOtOWoZiwYrs= From: Tomi Valkeinen Date: Mon, 24 Mar 2025 10:04:46 +0200 Subject: [PATCH v4 3/3] media: i2c: ds90ub913: Use v4l2_subdev_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-v4-3-dbe2412297cc@ideasonboard.com> References: <20250324-frame-desc-passthrough-v4-0-dbe2412297cc@ideasonboard.com> In-Reply-To: <20250324-frame-desc-passthrough-v4-0-dbe2412297cc@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=2627; i=tomi.valkeinen+renesas@ideasonboard.com; h=from:subject:message-id; bh=CW2HMs0XwwdWNF0z9jeJT15ET7DbR6dbxCPOb57gTgY=; b=owEBbQKS/ZANAwAIAfo9qoy8lh71AcsmYgBn4RIs2d3FK4AfzpkhoaSd1vrqISNwE4XJC0Z35 lObQtayJZ2JAjMEAAEIAB0WIQTEOAw+ll79gQef86f6PaqMvJYe9QUCZ+ESLAAKCRD6PaqMvJYe 9QsjEACRgtJezDL/Lywj7jagb4Rfy1jhwRAR3R88JSCKWSv3MVyc3QRGXOezUd/RQkm0btQE7ed hxwBvywetxt9LvBhaCJIBgtcauLOee+qPp+zIgp77eMmPGbvSTd3FIbt+TI2fV/Ax3kT8Vt/EKW 8vdbDevP8JyUj5CgT4m/AhRhf93eK8+Gf2sFm4eu+5QfLtCNrxgqVpXoFRQgf4ySGu8twUPs0xo r9zNzPbcaSc++opGCJ8ooYalK7HnlYvW7tK0kWJXhqymYqA6iXrxAsJY90VOCzuRoBqsymbt23d QaopHw19GF/PZWi45FKP4heBFU2Q4csC8a2Gz5HtYwBRPe5cEjEFvo0lWk1btmMWcpFSqaHhoay bo0n9GuWgRSgjSst25W7MnDdeSRl26B4MRyAVuc3v9Lt/Hg5ko3pGA7+dBoiYoqEbHuvspAm3sj W5dQv0u3k8+M/TjufNdkws5HlgFxzwZcasKkxMjChUWbFhrc8HAuI8WIKS+clTWJwq5HIJ6AUN9 woJP+hQHz/mf2AYLNXcEqAxMmDsvvnbqXMpWmW1uZhqqTicNvlXzyl+5gU1knRhWrJVxdkslRHZ dadO0qF3uKbvhn6BN/lWI12KC8txzisCokwAWeA3FY4e1AgVf1wGsCff8zxHu6Es3CqY680cUym pQYPPyI8772aPfA== X-Developer-Key: i=tomi.valkeinen+renesas@ideasonboard.com; a=openpgp; fpr=C4380C3E965EFD81079FF3A7FA3DAA8CBC961EF5 Use the new v4l2_subdev_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, };