From: Sakari Ailus <sakari.ailus@linux.intel.com>
To: linux-media@vger.kernel.org
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
tomi.valkeinen@ideasonboard.com, bingbu.cao@intel.com,
hongju.wang@intel.com, hverkuil@xs4all.nl,
Andrey Konovalov <andrey.konovalov@linaro.org>,
Jacopo Mondi <jacopo.mondi@ideasonboard.com>,
Dmitry Perchanov <dmitry.perchanov@intel.com>,
"Ng, Khai Wen" <khai.wen.ng@intel.com>,
Alain Volmat <alain.volmat@foss.st.com>
Subject: [PATCH v9 26/46] media: mc: Add INTERNAL pad flag
Date: Tue, 16 Apr 2024 22:32:59 +0300 [thread overview]
Message-ID: <20240416193319.778192-27-sakari.ailus@linux.intel.com> (raw)
In-Reply-To: <20240416193319.778192-1-sakari.ailus@linux.intel.com>
Internal sink pads will be used as routing endpoints in V4L2 [GS]_ROUTING
IOCTLs, to indicate that the stream begins in the entity. Internal sink
pads are pads that have both SINK and INTERNAL flags set.
Also prevent creating links to pads that have been flagged as internal and
initialising SOURCE pads with INTERNAL flag set.
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
.../userspace-api/media/mediactl/media-types.rst | 9 +++++++++
drivers/media/mc/mc-entity.c | 15 ++++++++++++---
include/uapi/linux/media.h | 1 +
3 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/Documentation/userspace-api/media/mediactl/media-types.rst b/Documentation/userspace-api/media/mediactl/media-types.rst
index 6332e8395263..200c37a1da26 100644
--- a/Documentation/userspace-api/media/mediactl/media-types.rst
+++ b/Documentation/userspace-api/media/mediactl/media-types.rst
@@ -361,6 +361,7 @@ Types and flags used to represent the media graph elements
.. _MEDIA-PAD-FL-SINK:
.. _MEDIA-PAD-FL-SOURCE:
.. _MEDIA-PAD-FL-MUST-CONNECT:
+.. _MEDIA-PAD-FL-INTERNAL:
.. flat-table:: Media pad flags
:header-rows: 0
@@ -381,6 +382,14 @@ Types and flags used to represent the media graph elements
enabled links even when this flag isn't set; the absence of the flag
doesn't imply there is none.
+ * - ``MEDIA_PAD_FL_INTERNAL``
+ - The internal flag indicates an internal pad that has no external
+ connections. As they are internal to entities, internal pads shall not
+ be connected with links.
+
+ The internal flag may currently be present only in a sink pad where it
+ indicates that the :ref:``stream <media-glossary-stream>`` originates
+ from within the entity.
One and only one of ``MEDIA_PAD_FL_SINK`` and ``MEDIA_PAD_FL_SOURCE``
must be set for every pad.
diff --git a/drivers/media/mc/mc-entity.c b/drivers/media/mc/mc-entity.c
index 0e28b9a7936e..7747aa16f37e 100644
--- a/drivers/media/mc/mc-entity.c
+++ b/drivers/media/mc/mc-entity.c
@@ -209,11 +209,16 @@ int media_entity_pads_init(struct media_entity *entity, u16 num_pads,
mutex_lock(&mdev->graph_mutex);
media_entity_for_each_pad(entity, iter) {
+ const u32 pad_flags = iter->flags & (MEDIA_PAD_FL_SINK |
+ MEDIA_PAD_FL_SOURCE |
+ MEDIA_PAD_FL_INTERNAL);
+
iter->entity = entity;
iter->index = i++;
- if (hweight32(iter->flags & (MEDIA_PAD_FL_SINK |
- MEDIA_PAD_FL_SOURCE)) != 1) {
+ if (pad_flags != MEDIA_PAD_FL_SINK &&
+ pad_flags != (MEDIA_PAD_FL_SINK | MEDIA_PAD_FL_INTERNAL) &&
+ pad_flags != MEDIA_PAD_FL_SOURCE) {
ret = -EINVAL;
break;
}
@@ -1112,7 +1117,8 @@ int media_get_pad_index(struct media_entity *entity, u32 pad_type,
for (i = 0; i < entity->num_pads; i++) {
if ((entity->pads[i].flags &
- (MEDIA_PAD_FL_SINK | MEDIA_PAD_FL_SOURCE)) != pad_type)
+ (MEDIA_PAD_FL_SINK | MEDIA_PAD_FL_SOURCE |
+ MEDIA_PAD_FL_INTERNAL)) != pad_type)
continue;
if (entity->pads[i].sig_type == sig_type)
@@ -1142,6 +1148,9 @@ media_create_pad_link(struct media_entity *source, u16 source_pad,
return -EINVAL;
if (WARN_ON(!(sink->pads[sink_pad].flags & MEDIA_PAD_FL_SINK)))
return -EINVAL;
+ if (WARN_ON(source->pads[source_pad].flags & MEDIA_PAD_FL_INTERNAL) ||
+ WARN_ON(sink->pads[sink_pad].flags & MEDIA_PAD_FL_INTERNAL))
+ return -EINVAL;
link = media_add_link(&source->links);
if (link == NULL)
diff --git a/include/uapi/linux/media.h b/include/uapi/linux/media.h
index 1c80b1d6bbaf..80cfd12a43fc 100644
--- a/include/uapi/linux/media.h
+++ b/include/uapi/linux/media.h
@@ -208,6 +208,7 @@ struct media_entity_desc {
#define MEDIA_PAD_FL_SINK (1U << 0)
#define MEDIA_PAD_FL_SOURCE (1U << 1)
#define MEDIA_PAD_FL_MUST_CONNECT (1U << 2)
+#define MEDIA_PAD_FL_INTERNAL (1U << 3)
struct media_pad_desc {
__u32 entity; /* entity ID */
--
2.39.2
next prev parent reply other threads:[~2024-04-16 19:34 UTC|newest]
Thread overview: 103+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-16 19:32 [PATCH v9 00/46] Generic line based metadata support, internal pads Sakari Ailus
2024-04-16 19:32 ` [PATCH v9 01/46] media: v4l2-subdev: Fix stream handling for crop API Sakari Ailus
2024-04-16 19:32 ` [PATCH v9 02/46] media: v4l2-subdev: Clearly document that the crop API won't be extended Sakari Ailus
2024-04-16 19:32 ` [PATCH v9 03/46] media: Documentation: Add "stream" into glossary Sakari Ailus
2024-04-19 16:02 ` Laurent Pinchart
2024-04-16 19:32 ` [PATCH v9 04/46] media: uapi: Add generic serial metadata mbus formats Sakari Ailus
2024-04-16 19:32 ` [PATCH v9 05/46] media: uapi: Document which mbus format fields are valid for metadata Sakari Ailus
2024-04-19 16:05 ` Laurent Pinchart
2024-04-16 19:32 ` [PATCH v9 06/46] media: uapi: v4l: Add generic 8-bit metadata format definitions Sakari Ailus
2024-04-19 16:26 ` Laurent Pinchart
2024-04-23 7:04 ` Sakari Ailus
2024-04-23 7:32 ` Laurent Pinchart
2024-04-23 9:54 ` Sakari Ailus
2024-04-16 19:32 ` [PATCH v9 07/46] media: v4l: Support line-based metadata capture Sakari Ailus
2024-04-19 16:30 ` Laurent Pinchart
2024-04-23 7:31 ` Sakari Ailus
2024-04-16 19:32 ` [PATCH v9 08/46] media: Documentation: Additional streams generally don't harm capture Sakari Ailus
2024-04-16 19:32 ` [PATCH v9 09/46] media: Documentation: Document embedded data guidelines for camera sensors Sakari Ailus
2024-04-16 19:32 ` [PATCH v9 10/46] media: Documentation: v4l: Document internal sink pads Sakari Ailus
2024-04-19 18:49 ` Laurent Pinchart
2024-04-23 10:27 ` Sakari Ailus
2024-04-23 12:56 ` Laurent Pinchart
2024-04-23 16:06 ` Sakari Ailus
2025-02-26 9:16 ` Mirela Rabulea
2025-02-26 9:49 ` Sakari Ailus
2024-04-16 19:32 ` [PATCH v9 11/46] media: Documentation: Document S_ROUTING behaviour Sakari Ailus
2024-04-19 17:17 ` Laurent Pinchart
2024-04-23 10:08 ` Sakari Ailus
2024-04-23 12:59 ` Laurent Pinchart
2024-04-23 13:33 ` Sakari Ailus
2024-04-16 19:32 ` [PATCH v9 12/46] media: v4l: subdev: Add a function to lock two sub-device states, use it Sakari Ailus
2024-04-16 19:32 ` [PATCH v9 13/46] media: v4l: subdev: Move G_ROUTING handling below S_ROUTING Sakari Ailus
2024-04-16 19:32 ` [PATCH v9 14/46] media: v4l: subdev: Copy argument back to user also for S_ROUTING Sakari Ailus
2024-04-16 19:32 ` [PATCH v9 15/46] media: v4l: subdev: Add len_routes field to struct v4l2_subdev_routing Sakari Ailus
2024-04-19 22:45 ` Laurent Pinchart
2024-04-23 10:45 ` Sakari Ailus
2024-04-23 12:54 ` Laurent Pinchart
2024-04-23 16:05 ` Sakari Ailus
2024-04-16 19:32 ` [PATCH v9 16/46] media: v4l: subdev: Return routes set using S_ROUTING Sakari Ailus
2024-04-19 22:55 ` Laurent Pinchart
2024-04-23 10:49 ` Sakari Ailus
2024-04-23 11:41 ` Laurent Pinchart
2024-04-16 19:32 ` [PATCH v9 17/46] media: v4l: subdev: Add trivial set_routing support Sakari Ailus
2024-04-16 19:32 ` [PATCH v9 18/46] media: ccs: No need to set streaming to false in power off Sakari Ailus
2024-04-16 19:32 ` [PATCH v9 19/46] media: ccs: Move ccs_pm_get_init function up Sakari Ailus
2024-04-20 7:53 ` Laurent Pinchart
2024-04-16 19:32 ` [PATCH v9 20/46] media: ccs: Rename out label of ccs_start_streaming Sakari Ailus
2024-04-20 8:01 ` Laurent Pinchart
2024-04-16 19:32 ` [PATCH v9 21/46] media: ccs: Use {enable,disable}_streams operations Sakari Ailus
2024-04-20 7:57 ` Laurent Pinchart
2024-04-16 19:32 ` [PATCH v9 22/46] media: ccs: Track streaming state Sakari Ailus
2024-04-16 19:32 ` [PATCH v9 23/46] media: ccs: Move ccs_validate_csi_data_format up Sakari Ailus
2024-04-16 19:32 ` [PATCH v9 24/46] media: ccs: Support frame descriptors Sakari Ailus
2024-04-20 8:00 ` Laurent Pinchart
2024-04-16 19:32 ` [PATCH v9 25/46] media: uapi: v4l: subdev: Enable streams API Sakari Ailus
2024-04-16 19:32 ` Sakari Ailus [this message]
2024-04-16 19:33 ` [PATCH v9 27/46] media: uapi: ccs: Add media bus code for MIPI CCS embedded data Sakari Ailus
2024-04-20 8:10 ` Laurent Pinchart
2024-10-23 7:35 ` Jacopo Mondi
2024-04-16 19:33 ` [PATCH v9 28/46] media: Documentation: Document non-CCS use of CCS embedded data format Sakari Ailus
2024-04-20 8:12 ` Laurent Pinchart
2024-04-16 19:33 ` [PATCH v9 29/46] media: Documentation: ccs: Document routing Sakari Ailus
2024-04-20 8:31 ` Laurent Pinchart
2024-04-23 11:06 ` Sakari Ailus
2024-04-16 19:33 ` [PATCH v9 30/46] media: ccs: Add support for embedded data stream Sakari Ailus
2024-04-20 8:59 ` Laurent Pinchart
2024-04-23 12:33 ` Sakari Ailus
2024-04-23 12:50 ` Laurent Pinchart
2024-04-23 13:29 ` Sakari Ailus
2024-04-16 19:33 ` [PATCH v9 31/46] media: ccs: Remove ccs_get_crop_compose helper Sakari Ailus
2024-04-20 9:04 ` Laurent Pinchart
2024-04-16 19:33 ` [PATCH v9 32/46] media: ccs: Rely on sub-device state locking Sakari Ailus
2024-04-20 9:16 ` Laurent Pinchart
2025-09-22 7:38 ` Sakari Ailus
2024-04-16 19:33 ` [PATCH v9 33/46] media: ccs: Compute binning configuration from sub-device state Sakari Ailus
2024-04-20 9:19 ` Laurent Pinchart
2024-04-16 19:33 ` [PATCH v9 34/46] media: ccs: Compute scaling " Sakari Ailus
2024-04-20 9:24 ` Laurent Pinchart
2024-04-16 19:33 ` [PATCH v9 35/46] media: ccs: Remove which parameter from ccs_propagate Sakari Ailus
2024-04-16 19:33 ` [PATCH v9 36/46] media: uapi: Add media bus code for ov2740 embedded data Sakari Ailus
2024-04-20 9:29 ` Laurent Pinchart
2025-09-22 7:47 ` Sakari Ailus
2024-04-16 19:33 ` [PATCH v9 37/46] media: ov2740: Fix LINK_FREQ and PIXEL_RATE control value reporting Sakari Ailus
2024-04-20 9:42 ` Laurent Pinchart
2024-04-24 9:15 ` Sakari Ailus
2024-04-16 19:33 ` [PATCH v9 38/46] media: ov2740: Remove shorthand variables Sakari Ailus
2024-04-20 9:30 ` Laurent Pinchart
2024-04-16 19:33 ` [PATCH v9 39/46] media: ov2740: Switch to {enable,disable}_streams Sakari Ailus
2024-04-16 19:33 ` [PATCH v9 40/46] media: ov2740: Track streaming state Sakari Ailus
2024-04-16 19:33 ` [PATCH v9 41/46] media: ov2740: Add support for embedded data Sakari Ailus
2024-04-20 9:38 ` Laurent Pinchart
2024-04-16 19:33 ` [PATCH v9 42/46] media: ov2740: Add generic sensor fwnode properties as controls Sakari Ailus
2024-04-20 9:40 ` Laurent Pinchart
2024-04-23 16:17 ` Sakari Ailus
2024-04-24 8:51 ` Laurent Pinchart
2024-04-16 19:33 ` [PATCH v9 43/46] media: ov2740: Add support for G_SELECTION IOCTL Sakari Ailus
2024-04-20 9:43 ` Laurent Pinchart
2024-04-16 19:33 ` [PATCH v9 44/46] media: v4l: Add V4L2_SUBDEV_ROUTE_FL_IMMUTABLE sub-device routing flag Sakari Ailus
2024-04-20 9:49 ` Laurent Pinchart
2024-04-16 19:33 ` [PATCH v9 45/46] media: ccs: Add IMMUTABLE route flag Sakari Ailus
2024-04-16 19:33 ` [PATCH v9 46/46] media: ov2740: " Sakari Ailus
2024-04-20 10:05 ` [PATCH v9 00/46] Generic line based metadata support, internal pads Laurent Pinchart
2024-09-30 13:20 ` Mirela Rabulea
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240416193319.778192-27-sakari.ailus@linux.intel.com \
--to=sakari.ailus@linux.intel.com \
--cc=alain.volmat@foss.st.com \
--cc=andrey.konovalov@linaro.org \
--cc=bingbu.cao@intel.com \
--cc=dmitry.perchanov@intel.com \
--cc=hongju.wang@intel.com \
--cc=hverkuil@xs4all.nl \
--cc=jacopo.mondi@ideasonboard.com \
--cc=khai.wen.ng@intel.com \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-media@vger.kernel.org \
--cc=tomi.valkeinen@ideasonboard.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.