All of lore.kernel.org
 help / color / mirror / Atom feed
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>
Subject: [PATCH v6 01/28] media: mc: Add INTERNAL pad flag
Date: Tue,  3 Oct 2023 14:52:29 +0300	[thread overview]
Message-ID: <20231003115237.76828-2-sakari.ailus@linux.intel.com> (raw)
In-Reply-To: <20231003115237.76828-1-sakari.ailus@linux.intel.com>

Internal source pads will be used as routing endpoints in V4L2
[GS]_ROUTING IOCTLs, to indicate that the stream begins in the entity.

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>
---
 Documentation/userspace-api/media/glossary.rst         |  6 ++++++
 .../userspace-api/media/mediactl/media-types.rst       |  6 ++++++
 drivers/media/mc/mc-entity.c                           | 10 ++++++++--
 include/uapi/linux/media.h                             |  1 +
 4 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/Documentation/userspace-api/media/glossary.rst b/Documentation/userspace-api/media/glossary.rst
index 96a360edbf3b..f7b99a4527c7 100644
--- a/Documentation/userspace-api/media/glossary.rst
+++ b/Documentation/userspace-api/media/glossary.rst
@@ -173,6 +173,12 @@ Glossary
 	An integrated circuit that integrates all components of a computer
 	or other electronic systems.
 
+_media-glossary-stream:
+    Stream
+	A distinct flow of data (image data or metadata) over a media pipeline
+	from source to sink. A source may be e.g. an image sensor and a sink
+	e.g. a memory buffer.
+
     V4L2 API
 	**V4L2 userspace API**
 
diff --git a/Documentation/userspace-api/media/mediactl/media-types.rst b/Documentation/userspace-api/media/mediactl/media-types.rst
index 0ffeece1e0c8..28941da27790 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
@@ -382,6 +383,11 @@ Types and flags used to represent the media graph elements
 	  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. Such a pad shall not be connected with a link. The
+	  internal flag indicates that the :ref:``stream
+	  <media-glossary-stream>`` either starts or ends in 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 543a392f8635..f5f290781021 100644
--- a/drivers/media/mc/mc-entity.c
+++ b/drivers/media/mc/mc-entity.c
@@ -213,7 +213,9 @@ int media_entity_pads_init(struct media_entity *entity, u16 num_pads,
 		iter->index = i++;
 
 		if (hweight32(iter->flags & (MEDIA_PAD_FL_SINK |
-					     MEDIA_PAD_FL_SOURCE)) != 1) {
+					     MEDIA_PAD_FL_SOURCE)) != 1 ||
+		    (iter->flags & MEDIA_PAD_FL_INTERNAL &&
+		     !(iter->flags & MEDIA_PAD_FL_SINK))) {
 			ret = -EINVAL;
 			break;
 		}
@@ -1075,7 +1077,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)
@@ -1100,6 +1103,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(source->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


  reply	other threads:[~2023-10-03 11:52 UTC|newest]

Thread overview: 78+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-10-03 11:52 [PATCH v6 00/28] Generic line based metadata support, internal pads Sakari Ailus
2023-10-03 11:52 ` Sakari Ailus [this message]
2023-10-05  9:52   ` [PATCH v6 01/28] media: mc: Add INTERNAL pad flag Hans Verkuil
2023-10-05 10:22     ` Sakari Ailus
2023-10-05 11:16       ` Hans Verkuil
2023-10-25 21:17         ` Sakari Ailus
2023-10-11 19:22       ` Sakari Ailus
2023-10-05 11:04   ` Tomi Valkeinen
2023-10-11 19:35     ` Sakari Ailus
2023-10-03 11:52 ` [PATCH v6 02/28] media: uapi: Add generic serial metadata mbus formats Sakari Ailus
     [not found]   ` <20231027144742.GC19539@pendragon.ideasonboard.com>
2023-10-27 20:43     ` Sakari Ailus
2023-10-03 11:52 ` [PATCH v6 03/28] media: uapi: Document which mbus format fields are valid for metadata Sakari Ailus
2023-10-05 11:28   ` Tomi Valkeinen
2023-10-11 19:41     ` Sakari Ailus
2023-10-03 11:52 ` [PATCH v6 04/28] media: uapi: Add generic 8-bit metadata format definitions Sakari Ailus
2023-10-03 11:52 ` [PATCH v6 05/28] media: v4l: Support line-based metadata capture Sakari Ailus
2023-10-05 10:00   ` Hans Verkuil
2023-10-03 11:52 ` [PATCH v6 06/28] media: uapi: ccs: Add media bus code for MIPI CCS embedded data Sakari Ailus
2023-10-03 11:52 ` [PATCH v6 07/28] media: Documentation: ccs: Document routing Sakari Ailus
2023-10-03 11:52 ` [PATCH v6 08/28] media: Documentation: Additional streams generally don't harm capture Sakari Ailus
2023-10-05 11:40   ` Tomi Valkeinen
2023-10-03 11:52 ` [PATCH v6 09/28] media: Documentation: Document embedded data guidelines for camera sensors Sakari Ailus
2023-10-05 10:10   ` Hans Verkuil
2023-10-05 11:53     ` Tomi Valkeinen
2023-10-05 14:13       ` Sakari Ailus
2023-10-05 14:11     ` Sakari Ailus
2023-10-05 10:14   ` Hans Verkuil
2023-10-05 14:35     ` Sakari Ailus
2023-10-03 12:07 ` [PATCH v6 10/28] media: Documentation: v4l: Document source routes Sakari Ailus
2023-10-05 10:26   ` Hans Verkuil
2023-10-09 17:31     ` Sakari Ailus
2023-10-05 12:37   ` Tomi Valkeinen
2023-10-09 17:26     ` Sakari Ailus
2023-10-03 12:07 ` [PATCH v6 11/28] media: Documentation: Document S_ROUTING behaviour Sakari Ailus
2023-10-05 12:59   ` Tomi Valkeinen
2023-10-12 20:00     ` Sakari Ailus
2023-10-03 12:07 ` [PATCH v6 12/28] media: v4l: subdev: Add helpers for format, crop and compose pointers Sakari Ailus
2023-10-05 13:12   ` Tomi Valkeinen
2023-10-13  6:05     ` Sakari Ailus
2023-10-03 12:07 ` [PATCH v6 13/28] media: v4l: subdev: Add a function to lock two sub-device states, use it Sakari Ailus
2023-10-09 10:34   ` Tomi Valkeinen
2023-10-25 21:11     ` Sakari Ailus
2023-10-03 12:07 ` [PATCH v6 14/28] media: v4l: subdev: Move G_ROUTING handling below S_ROUTING Sakari Ailus
2023-10-09 10:36   ` Tomi Valkeinen
2023-10-25 21:05     ` Sakari Ailus
2023-10-03 12:08 ` [PATCH v6 15/28] media: v4l: subdev: Copy argument back to user also for S_ROUTING Sakari Ailus
2023-10-05 10:37   ` Hans Verkuil
2023-10-12 20:09     ` Sakari Ailus
2023-10-03 12:08 ` [PATCH v6 16/28] media: v4l: subdev: Add len_routes field to struct v4l2_subdev_routing Sakari Ailus
2023-10-05 11:00   ` Hans Verkuil
2023-11-28 13:30     ` Sakari Ailus
2023-12-04 13:36       ` Hans Verkuil
2023-10-03 12:08 ` [PATCH v6 17/28] media: v4l: subdev: Return routes set using S_ROUTING Sakari Ailus
2023-10-05 11:05   ` Hans Verkuil
2023-10-25 20:12     ` Sakari Ailus
2023-10-03 12:08 ` [PATCH v6 18/28] media: uapi: Allow a larger number of routes than there's room for Sakari Ailus
2023-10-05 11:08   ` Hans Verkuil
2023-10-25 21:00     ` Sakari Ailus
2023-10-09 10:56   ` Tomi Valkeinen
2023-10-25 21:07     ` Laurent Pinchart
     [not found]       ` <adaadd6e-c163-4c3a-b851-b2de184b5b5e@xs4all.nl>
2023-10-30  7:57         ` Sakari Ailus
2023-10-03 12:08 ` [PATCH v6 19/28] media: v4l: subdev: Add trivial set_routing support Sakari Ailus
2023-10-09 11:09   ` Tomi Valkeinen
2023-10-03 12:08 ` [PATCH v6 20/28] media: uapi: v4l: subdev: Enable streams API Sakari Ailus
2023-10-09 12:52   ` Tomi Valkeinen
2023-10-25 21:13     ` Sakari Ailus
2023-10-03 12:08 ` [PATCH v6 21/28] media: ccs: No need to set streaming to false in power off Sakari Ailus
2023-10-03 12:08 ` [PATCH v6 22/28] media: ccs: Use {enable,disable}_streams operations Sakari Ailus
2023-10-03 12:08 ` [PATCH v6 23/28] media: ccs: Track streaming state Sakari Ailus
2023-10-03 12:08 ` [PATCH v6 24/28] media: ccs: Move ccs_validate_csi_data_format up Sakari Ailus
2023-10-03 12:08 ` [PATCH v6 25/28] media: ccs: Support frame descriptors Sakari Ailus
2023-10-03 12:08 ` [PATCH v6 26/28] media: ccs: Add support for embedded data stream Sakari Ailus
2023-10-03 12:08 ` [PATCH v6 27/28] media: ccs: Remove ccs_get_crop_compose helper Sakari Ailus
2023-10-03 12:08 ` [PATCH v6 28/28] media: ccs: Rely on sub-device state locking Sakari Ailus
2023-10-05  8:05 ` [PATCH v6 00/28] Generic line based metadata support, internal pads Tomi Valkeinen
2023-10-05  9:04   ` Sakari Ailus
2023-10-05 11:17     ` Tomi Valkeinen
2023-10-09 12:16       ` Sakari Ailus

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=20231003115237.76828-2-sakari.ailus@linux.intel.com \
    --to=sakari.ailus@linux.intel.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.