Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 14fae6fc authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

[media] davinci_vbpe: stop MEDIA_ENT_T_V4L2_SUBDEV abuse 



This driver is abusing MEDIA_ENT_T_V4L2_SUBDEV:

- it uses a hack to check if the remote entity is a subdev;
- it still uses the legacy entity subtype check macro, that
  will be removed soon.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 26614b9b

drivers/staging/media/davinci_vpfe/dm365_ipipe.c

+6 −3
Original line number Diff line number Diff line
@@ -1712,8 +1712,11 @@ ipipe_link_setup(struct media_entity *entity, const struct media_pad *local, 
	struct vpfe_device *vpfe_dev = to_vpfe_device(ipipe);

	u16 ipipeif_sink = vpfe_dev->vpfe_ipipeif.input;



	switch (local->index | media_entity_type(remote->entity)) {

	case IPIPE_PAD_SINK | MEDIA_ENT_T_V4L2_SUBDEV:

	if (!is_media_entity_v4l2_subdev(remote->entity))

		return -EINVAL;



	switch (local->index) {

	case IPIPE_PAD_SINK:

		if (!(flags & MEDIA_LNK_FL_ENABLED)) {

			ipipe->input = IPIPE_INPUT_NONE;

			break;
@@ -1726,7 +1729,7 @@ ipipe_link_setup(struct media_entity *entity, const struct media_pad *local, 
			ipipe->input = IPIPE_INPUT_CCDC;

		break;



	case IPIPE_PAD_SOURCE | MEDIA_ENT_T_V4L2_SUBDEV:

	case IPIPE_PAD_SOURCE:

		/* out to RESIZER */

		if (flags & MEDIA_LNK_FL_ENABLED)

			ipipe->output = IPIPE_OUTPUT_RESIZER;

drivers/staging/media/davinci_vpfe/vpfe_video.c

+2 −3
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ vpfe_video_remote_subdev(struct vpfe_video_device *video, u32 *pad) 
{

	struct media_pad *remote = media_entity_remote_pad(&video->pad);



	if (remote == NULL || remote->entity->type != MEDIA_ENT_T_V4L2_SUBDEV)

	if (!remote || !is_media_entity_v4l2_subdev(remote->entity))

		return NULL;

	if (pad)

		*pad = remote->index;
@@ -243,8 +243,7 @@ static int vpfe_video_validate_pipeline(struct vpfe_pipeline *pipe) 


		/* Retrieve the source format */

		pad = media_entity_remote_pad(pad);

		if (pad == NULL ||

			pad->entity->type != MEDIA_ENT_T_V4L2_SUBDEV)

		if (!pad || !is_media_entity_v4l2_subdev(pad->entity))

			break;



		subdev = media_entity_to_v4l2_subdev(pad->entity);