On 08/23/15 22:17, Mauro Carvalho Chehab wrote:
> Now that interfaces and entities are distinct, it makes no sense
> of keeping something named as MEDIA_ENT_T_DEVNODE.
>
> This change was done with this script:
>
> for i in $(git grep -l MEDIA_ENT_T|grep -v uapi/linux/media.h); do sed s,MEDIA_ENT_T_DEVNODE_V4L,MEDIA_ENT_T_V4L2_VIDEO, <$i >a && mv a $i; done
>
> Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxxxxxxx>
>
> diff --git a/Documentation/DocBook/media/v4l/media-ioc-enum-entities.xml b/Documentation/DocBook/media/v4l/media-ioc-enum-entities.xml
> index 5872f8bbf774..910243d4edb8 100644
> --- a/Documentation/DocBook/media/v4l/media-ioc-enum-entities.xml
> +++ b/Documentation/DocBook/media/v4l/media-ioc-enum-entities.xml
> @@ -183,7 +183,7 @@
> <entry>Unknown device node</entry>
> </row>
> <row>
> - <entry><constant>MEDIA_ENT_T_DEVNODE_V4L</constant></entry>
> + <entry><constant>MEDIA_ENT_T_V4L2_VIDEO</constant></entry>
> <entry>V4L video, radio or vbi device node</entry>
> </row>
OK, this makes no sense and that ties in with my confusion of the previous patch.
These are not device nodes, in the new scheme these are DMA entities (I know,
naming TDB) that have an associated interface.
I think a much better approach would be to add entity type(s) for such DMA
engines in patch 24, then use that new name in existing drivers and split
up the existing DEVNODE_V4L media_entity into a media_entity and a
media_intf_devnode:
The current media_entity defined in struct video_device has to be replaced
by media_intf_devnode, and the DMA entity has to be added as a new entity
to these drivers.
This reflects these two action items from our meeting:
Migration: add v4l-subdev media_interface: Laurent
Migration: add explicit DMA Engine entity: Laurent
Unless Laurent says differently I think this is something you'll have to
do given Laurent's workload.
I think doing this at this stage of the patch series is crucial, otherwise
the remaining patches really make no sense.
I'll skip reviewing patches 26-38 for now.
Regards,
Hans
> <row>
> diff --git a/drivers/media/platform/xilinx/xilinx-dma.c b/drivers/media/platform/xilinx/xilinx-dma.c
> index 92e8116dc28f..88cd789cdaf7 100644
> --- a/drivers/media/platform/xilinx/xilinx-dma.c
> +++ b/drivers/media/platform/xilinx/xilinx-dma.c
> @@ -193,7 +193,7 @@ static int xvip_pipeline_validate(struct xvip_pipeline *pipe,
> while ((entity = media_entity_graph_walk_next(&graph))) {
> struct xvip_dma *dma;
>
> - if (entity->type != MEDIA_ENT_T_DEVNODE_V4L)
> + if (entity->type != MEDIA_ENT_T_V4L2_VIDEO)
> continue;
>
> dma = to_xvip_dma(media_entity_to_video_device(entity));
> diff --git a/drivers/media/v4l2-core/v4l2-dev.c b/drivers/media/v4l2-core/v4l2-dev.c
> index 71a1b93b0790..44b330589787 100644
> --- a/drivers/media/v4l2-core/v4l2-dev.c
> +++ b/drivers/media/v4l2-core/v4l2-dev.c
> @@ -912,7 +912,7 @@ int __video_register_device(struct video_device *vdev, int type, int nr,
> /* Part 5: Register the entity. */
> if (vdev->v4l2_dev->mdev &&
> vdev->vfl_type != VFL_TYPE_SUBDEV) {
> - vdev->entity.type = MEDIA_ENT_T_DEVNODE_V4L;
> + vdev->entity.type = MEDIA_ENT_T_V4L2_VIDEO;
> vdev->entity.name = vdev->name;
> vdev->entity.info.dev.major = VIDEO_MAJOR;
> vdev->entity.info.dev.minor = vdev->minor;
> diff --git a/drivers/media/v4l2-core/v4l2-subdev.c b/drivers/media/v4l2-core/v4l2-subdev.c
> index 83615b8fb46a..e6e1115d8215 100644
> --- a/drivers/media/v4l2-core/v4l2-subdev.c
> +++ b/drivers/media/v4l2-core/v4l2-subdev.c
> @@ -535,7 +535,7 @@ v4l2_subdev_link_validate_get_format(struct media_pad *pad,
> return v4l2_subdev_call(sd, pad, get_fmt, NULL, fmt);
> }
>
> - WARN(pad->entity->type != MEDIA_ENT_T_DEVNODE_V4L,
> + WARN(pad->entity->type != MEDIA_ENT_T_V4L2_VIDEO,
> "Driver bug! Wrong media entity type 0x%08x, entity %s\n",
> pad->entity->type, pad->entity->name);
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
