| Message ID | 9af2bbe9e63004f843e8478bc3d31cd03ea75d64.1441559233.git.mchehab@osg.samsung.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 09/06/2015 07:30 PM, Mauro Carvalho Chehab wrote: > Add entities to represent the connectors that exists inside a > hybrid TV device. > > Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com> > > diff --git a/include/uapi/linux/media.h b/include/uapi/linux/media.h > index b17f6763aff4..69433405aec2 100644 > --- a/include/uapi/linux/media.h > +++ b/include/uapi/linux/media.h > @@ -61,6 +61,7 @@ struct media_device_info { > #define MEDIA_ENT_T_DVB_BASE 0x00000000 > #define MEDIA_ENT_T_V4L2_BASE 0x00010000 > #define MEDIA_ENT_T_V4L2_SUBDEV_BASE 0x00020000 > +#define MEDIA_ENT_T_CONNECTOR_BASE 0x00030000 > > /* > * V4L2 entities - Those are used for DMA (mmap/DMABUF) and > @@ -105,6 +106,13 @@ struct media_device_info { > #define MEDIA_ENT_T_DVB_CA (MEDIA_ENT_T_DVB_BASE + 4) > #define MEDIA_ENT_T_DVB_NET_DECAP (MEDIA_ENT_T_DVB_BASE + 5) > > +/* Connectors */ > +#define MEDIA_ENT_T_CONN_RF (MEDIA_ENT_T_CONNECTOR_BASE) Please start at BASE + 1. With that change: Acked-by: Hans Verkuil <hans.verkuil@cisco.com> > +#define MEDIA_ENT_T_CONN_SVIDEO (MEDIA_ENT_T_CONNECTOR_BASE + 1) > +#define MEDIA_ENT_T_CONN_COMPOSITE (MEDIA_ENT_T_CONNECTOR_BASE + 2) > + /* For internal test signal generators and other debug connectors */ > +#define MEDIA_ENT_T_CONN_TEST (MEDIA_ENT_T_CONNECTOR_BASE + 3) > + > #ifndef __KERNEL__ > /* Legacy symbols used to avoid userspace compilation breakages */ > #define MEDIA_ENT_TYPE_SHIFT 16 > @@ -121,9 +129,9 @@ struct media_device_info { > #define MEDIA_ENT_T_DEVNODE_DVB (MEDIA_ENT_T_DEVNODE + 4) > #endif > > -/* Entity types */ > - > +/* Entity flags */ > #define MEDIA_ENT_FL_DEFAULT (1 << 0) > +#define MEDIA_ENT_FL_CONNECTOR (1 << 1) > > struct media_entity_desc { > __u32 id; > -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Mauro, Thank you for the patch. On Sunday 06 September 2015 14:30:49 Mauro Carvalho Chehab wrote: > Add entities to represent the connectors that exists inside a > hybrid TV device. > > Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com> > > diff --git a/include/uapi/linux/media.h b/include/uapi/linux/media.h > index b17f6763aff4..69433405aec2 100644 > --- a/include/uapi/linux/media.h > +++ b/include/uapi/linux/media.h > @@ -61,6 +61,7 @@ struct media_device_info { > #define MEDIA_ENT_T_DVB_BASE 0x00000000 > #define MEDIA_ENT_T_V4L2_BASE 0x00010000 > #define MEDIA_ENT_T_V4L2_SUBDEV_BASE 0x00020000 > +#define MEDIA_ENT_T_CONNECTOR_BASE 0x00030000 > > /* > * V4L2 entities - Those are used for DMA (mmap/DMABUF) and > @@ -105,6 +106,13 @@ struct media_device_info { > #define MEDIA_ENT_T_DVB_CA (MEDIA_ENT_T_DVB_BASE + 4) > #define MEDIA_ENT_T_DVB_NET_DECAP (MEDIA_ENT_T_DVB_BASE + 5) > > +/* Connectors */ > +#define MEDIA_ENT_T_CONN_RF (MEDIA_ENT_T_CONNECTOR_BASE) > +#define MEDIA_ENT_T_CONN_SVIDEO (MEDIA_ENT_T_CONNECTOR_BASE + 1) > +#define MEDIA_ENT_T_CONN_COMPOSITE (MEDIA_ENT_T_CONNECTOR_BASE + 2) > + /* For internal test signal generators and other debug connectors */ No need to a \t at the beginning of the line. > +#define MEDIA_ENT_T_CONN_TEST (MEDIA_ENT_T_CONNECTOR_BASE + 3) I'd like to see more information about this. When later renaming types to functions you rename this type as well, and I'm still not convinced that we shouldn't have both types and functions. Let's discuss these topics and the one below on the documentation patches. > #ifndef __KERNEL__ > /* Legacy symbols used to avoid userspace compilation breakages */ > #define MEDIA_ENT_TYPE_SHIFT 16 > @@ -121,9 +129,9 @@ struct media_device_info { > #define MEDIA_ENT_T_DEVNODE_DVB (MEDIA_ENT_T_DEVNODE + 4) > #endif > > -/* Entity types */ > - > +/* Entity flags */ > #define MEDIA_ENT_FL_DEFAULT (1 << 0) > +#define MEDIA_ENT_FL_CONNECTOR (1 << 1) Ditto, I'm not sure about the use cases. > struct media_entity_desc { > __u32 id;
Em Mon, 23 Nov 2015 20:09:02 +0200 Laurent Pinchart <laurent.pinchart@ideasonboard.com> escreveu: > Hi Mauro, > > Thank you for the patch. > > On Sunday 06 September 2015 14:30:49 Mauro Carvalho Chehab wrote: > > Add entities to represent the connectors that exists inside a > > hybrid TV device. > > > > Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com> > > > > diff --git a/include/uapi/linux/media.h b/include/uapi/linux/media.h > > index b17f6763aff4..69433405aec2 100644 > > --- a/include/uapi/linux/media.h > > +++ b/include/uapi/linux/media.h > > @@ -61,6 +61,7 @@ struct media_device_info { > > #define MEDIA_ENT_T_DVB_BASE 0x00000000 > > #define MEDIA_ENT_T_V4L2_BASE 0x00010000 > > #define MEDIA_ENT_T_V4L2_SUBDEV_BASE 0x00020000 > > +#define MEDIA_ENT_T_CONNECTOR_BASE 0x00030000 > > > > /* > > * V4L2 entities - Those are used for DMA (mmap/DMABUF) and > > @@ -105,6 +106,13 @@ struct media_device_info { > > #define MEDIA_ENT_T_DVB_CA (MEDIA_ENT_T_DVB_BASE + 4) > > #define MEDIA_ENT_T_DVB_NET_DECAP (MEDIA_ENT_T_DVB_BASE + 5) > > > > +/* Connectors */ > > +#define MEDIA_ENT_T_CONN_RF (MEDIA_ENT_T_CONNECTOR_BASE) > > +#define MEDIA_ENT_T_CONN_SVIDEO (MEDIA_ENT_T_CONNECTOR_BASE + 1) > > +#define MEDIA_ENT_T_CONN_COMPOSITE (MEDIA_ENT_T_CONNECTOR_BASE + 2) > > + /* For internal test signal generators and other debug connectors */ > > No need to a \t at the beginning of the line. Removed. > > > +#define MEDIA_ENT_T_CONN_TEST (MEDIA_ENT_T_CONNECTOR_BASE + 3) > > I'd like to see more information about this. Some hardware have internally a simple signal generator on the chipset that generate test sequences. They're part of the input selection switch. In the case of au0828, the demodulator (actually au8522) has the follow inputs: - TV connector; - S-Video input connector; - Composite input connector; - TV signal test generator. The input can be controlled via V4L2 VIDIOC_*_INPUT ioctls. The Media Controller should be able to reflect the topology, as keeping this input not visible would be inconsistent. > When later renaming types to functions you rename this type as well, and I'm > still not convinced that we shouldn't have both types and functions. Not sure what you're meaning here. > Let's discuss these topics and the one below on the documentation patches. Ok. > > > #ifndef __KERNEL__ > > /* Legacy symbols used to avoid userspace compilation breakages */ > > #define MEDIA_ENT_TYPE_SHIFT 16 > > @@ -121,9 +129,9 @@ struct media_device_info { > > #define MEDIA_ENT_T_DEVNODE_DVB (MEDIA_ENT_T_DEVNODE + 4) > > #endif > > > > -/* Entity types */ > > - > > +/* Entity flags */ > > #define MEDIA_ENT_FL_DEFAULT (1 << 0) > > +#define MEDIA_ENT_FL_CONNECTOR (1 << 1) > > Ditto, I'm not sure about the use cases. The distinction between connectors and "normal" entities was largely discussed during the MC workshop. See the workshop notes. During the discussions of the Hans RFC sent just after the workshop, we decided that, instead of adding yet another graph type, it would be easier to just add a flag for the connectors. Regards, Mauro > > > struct media_entity_desc { > > __u32 id; > -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/include/uapi/linux/media.h b/include/uapi/linux/media.h index b17f6763aff4..69433405aec2 100644 --- a/include/uapi/linux/media.h +++ b/include/uapi/linux/media.h @@ -61,6 +61,7 @@ struct media_device_info { #define MEDIA_ENT_T_DVB_BASE 0x00000000 #define MEDIA_ENT_T_V4L2_BASE 0x00010000 #define MEDIA_ENT_T_V4L2_SUBDEV_BASE 0x00020000 +#define MEDIA_ENT_T_CONNECTOR_BASE 0x00030000 /* * V4L2 entities - Those are used for DMA (mmap/DMABUF) and @@ -105,6 +106,13 @@ struct media_device_info { #define MEDIA_ENT_T_DVB_CA (MEDIA_ENT_T_DVB_BASE + 4) #define MEDIA_ENT_T_DVB_NET_DECAP (MEDIA_ENT_T_DVB_BASE + 5) +/* Connectors */ +#define MEDIA_ENT_T_CONN_RF (MEDIA_ENT_T_CONNECTOR_BASE) +#define MEDIA_ENT_T_CONN_SVIDEO (MEDIA_ENT_T_CONNECTOR_BASE + 1) +#define MEDIA_ENT_T_CONN_COMPOSITE (MEDIA_ENT_T_CONNECTOR_BASE + 2) + /* For internal test signal generators and other debug connectors */ +#define MEDIA_ENT_T_CONN_TEST (MEDIA_ENT_T_CONNECTOR_BASE + 3) + #ifndef __KERNEL__ /* Legacy symbols used to avoid userspace compilation breakages */ #define MEDIA_ENT_TYPE_SHIFT 16 @@ -121,9 +129,9 @@ struct media_device_info { #define MEDIA_ENT_T_DEVNODE_DVB (MEDIA_ENT_T_DEVNODE + 4) #endif -/* Entity types */ - +/* Entity flags */ #define MEDIA_ENT_FL_DEFAULT (1 << 0) +#define MEDIA_ENT_FL_CONNECTOR (1 << 1) struct media_entity_desc { __u32 id;
Add entities to represent the connectors that exists inside a hybrid TV device. Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>