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

Commit babca007 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files

[media] v4l: vsp1: Don't validate links when the userspace API is disabled 



As the pipeline is configured internally by the driver when the
userspace API is disabled its configuration can be trusted and link
validation isn't needed.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 3dbb6100

drivers/media/platform/vsp1/vsp1.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -78,6 +78,8 @@ struct vsp1_device { 




	struct v4l2_device v4l2_dev;

	struct v4l2_device v4l2_dev;

	struct media_device media_dev;

	struct media_device media_dev;



	struct media_entity_operations media_ops;

};

};





int vsp1_device_get(struct vsp1_device *vsp1);

int vsp1_device_get(struct vsp1_device *vsp1);

drivers/media/platform/vsp1/vsp1_bru.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -424,7 +424,7 @@ struct vsp1_bru *vsp1_bru_create(struct vsp1_device *vsp1) 
	subdev = &bru->entity.subdev;

	subdev = &bru->entity.subdev;

	v4l2_subdev_init(subdev, &bru_ops);

	v4l2_subdev_init(subdev, &bru_ops);





	subdev->entity.ops = &vsp1_media_ops;

	subdev->entity.ops = &vsp1->media_ops;

	subdev->internal_ops = &vsp1_subdev_internal_ops;

	subdev->internal_ops = &vsp1_subdev_internal_ops;

	snprintf(subdev->name, sizeof(subdev->name), "%s bru",

	snprintf(subdev->name, sizeof(subdev->name), "%s bru",

		 dev_name(vsp1->dev));

		 dev_name(vsp1->dev));

drivers/media/platform/vsp1/vsp1_drv.c

+10 −0
Original line number Original line Diff line number Diff line
@@ -21,6 +21,8 @@ 
#include <linux/platform_device.h>

#include <linux/platform_device.h>

#include <linux/videodev2.h>

#include <linux/videodev2.h>





#include <media/v4l2-subdev.h>



#include "vsp1.h"

#include "vsp1.h"

#include "vsp1_bru.h"

#include "vsp1_bru.h"

#include "vsp1_hsit.h"

#include "vsp1_hsit.h"
@@ -214,6 +216,14 @@ static int vsp1_create_entities(struct vsp1_device *vsp1) 
		 dev_name(mdev->dev));

		 dev_name(mdev->dev));

	media_device_init(mdev);

	media_device_init(mdev);





	vsp1->media_ops.link_setup = vsp1_entity_link_setup;

	/* Don't perform link validation when the userspace API is disabled as

	 * the pipeline is configured internally by the driver in that case, and

	 * its configuration can thus be trusted.

	 */

	if (vsp1->pdata.uapi)

		vsp1->media_ops.link_validate = v4l2_subdev_link_validate;



	vdev->mdev = mdev;

	vdev->mdev = mdev;

	ret = v4l2_device_register(vsp1->dev, vdev);

	ret = v4l2_device_register(vsp1->dev, vdev);

	if (ret < 0) {

	if (ret < 0) {

drivers/media/platform/vsp1/vsp1_entity.c

+3 −8
Original line number Original line Diff line number Diff line
@@ -131,7 +131,7 @@ const struct v4l2_subdev_internal_ops vsp1_subdev_internal_ops = { 
 * Media Operations

 * Media Operations

 */

 */





static int vsp1_entity_link_setup(struct media_entity *entity,

int vsp1_entity_link_setup(struct media_entity *entity,

			   const struct media_pad *local,

			   const struct media_pad *local,

			   const struct media_pad *remote, u32 flags)

			   const struct media_pad *remote, u32 flags)

{

{
@@ -158,11 +158,6 @@ static int vsp1_entity_link_setup(struct media_entity *entity, 
	return 0;

	return 0;

}

}





const struct media_entity_operations vsp1_media_ops = {

	.link_setup = vsp1_entity_link_setup,

	.link_validate = v4l2_subdev_link_validate,

};



/* -----------------------------------------------------------------------------

/* -----------------------------------------------------------------------------

 * Initialization

 * Initialization

 */

 */

drivers/media/platform/vsp1/vsp1_entity.h

+4 −1
Original line number Original line Diff line number Diff line
@@ -86,7 +86,10 @@ int vsp1_entity_init(struct vsp1_device *vsp1, struct vsp1_entity *entity, 
void vsp1_entity_destroy(struct vsp1_entity *entity);

void vsp1_entity_destroy(struct vsp1_entity *entity);





extern const struct v4l2_subdev_internal_ops vsp1_subdev_internal_ops;

extern const struct v4l2_subdev_internal_ops vsp1_subdev_internal_ops;

extern const struct media_entity_operations vsp1_media_ops;



int vsp1_entity_link_setup(struct media_entity *entity,

			   const struct media_pad *local,

			   const struct media_pad *remote, u32 flags);





struct v4l2_mbus_framefmt *

struct v4l2_mbus_framefmt *

vsp1_entity_get_pad_format(struct vsp1_entity *entity,

vsp1_entity_get_pad_format(struct vsp1_entity *entity,