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

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

[media] v4l: vsp1: Support multi-input entities 



Rework the route configuration code to support entities with multiple
sink pads.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent 6051f5f8

drivers/media/platform/vsp1/vsp1_entity.c

+27 −27
Original line number Original line Diff line number Diff line
@@ -100,8 +100,10 @@ static int vsp1_entity_link_setup(struct media_entity *entity, 
		if (source->sink)

		if (source->sink)

			return -EBUSY;

			return -EBUSY;

		source->sink = remote->entity;

		source->sink = remote->entity;

		source->sink_pad = remote->index;

	} else {

	} else {

		source->sink = NULL;

		source->sink = NULL;

		source->sink_pad = 0;

	}

	}





	return 0;

	return 0;
@@ -116,42 +118,40 @@ const struct media_entity_operations vsp1_media_ops = { 
 * Initialization

 * Initialization

 */

 */





static const struct vsp1_route vsp1_routes[] = {

	{ VSP1_ENTITY_HSI, 0, VI6_DPR_HSI_ROUTE, { VI6_DPR_NODE_HSI, } },

	{ VSP1_ENTITY_HST, 0, VI6_DPR_HST_ROUTE, { VI6_DPR_NODE_HST, } },

	{ VSP1_ENTITY_LIF, 0, 0, { VI6_DPR_NODE_LIF, } },

	{ VSP1_ENTITY_LUT, 0, VI6_DPR_LUT_ROUTE, { VI6_DPR_NODE_LUT, } },

	{ VSP1_ENTITY_RPF, 0, VI6_DPR_RPF_ROUTE(0), { VI6_DPR_NODE_RPF(0), } },

	{ VSP1_ENTITY_RPF, 1, VI6_DPR_RPF_ROUTE(1), { VI6_DPR_NODE_RPF(1), } },

	{ VSP1_ENTITY_RPF, 2, VI6_DPR_RPF_ROUTE(2), { VI6_DPR_NODE_RPF(2), } },

	{ VSP1_ENTITY_RPF, 3, VI6_DPR_RPF_ROUTE(3), { VI6_DPR_NODE_RPF(3), } },

	{ VSP1_ENTITY_RPF, 4, VI6_DPR_RPF_ROUTE(4), { VI6_DPR_NODE_RPF(4), } },

	{ VSP1_ENTITY_SRU, 0, VI6_DPR_SRU_ROUTE, { VI6_DPR_NODE_SRU, } },

	{ VSP1_ENTITY_UDS, 0, VI6_DPR_UDS_ROUTE(0), { VI6_DPR_NODE_UDS(0), } },

	{ VSP1_ENTITY_UDS, 1, VI6_DPR_UDS_ROUTE(1), { VI6_DPR_NODE_UDS(1), } },

	{ VSP1_ENTITY_UDS, 2, VI6_DPR_UDS_ROUTE(2), { VI6_DPR_NODE_UDS(2), } },

	{ VSP1_ENTITY_WPF, 0, 0, { VI6_DPR_NODE_WPF(0), } },

	{ VSP1_ENTITY_WPF, 1, 0, { VI6_DPR_NODE_WPF(1), } },

	{ VSP1_ENTITY_WPF, 2, 0, { VI6_DPR_NODE_WPF(2), } },

	{ VSP1_ENTITY_WPF, 3, 0, { VI6_DPR_NODE_WPF(3), } },

};



int vsp1_entity_init(struct vsp1_device *vsp1, struct vsp1_entity *entity,

int vsp1_entity_init(struct vsp1_device *vsp1, struct vsp1_entity *entity,

		     unsigned int num_pads)

		     unsigned int num_pads)

{

{

	static const struct {

		unsigned int id;

		unsigned int reg;

	} routes[] = {

		{ VI6_DPR_NODE_HSI, VI6_DPR_HSI_ROUTE },

		{ VI6_DPR_NODE_HST, VI6_DPR_HST_ROUTE },

		{ VI6_DPR_NODE_LIF, 0 },

		{ VI6_DPR_NODE_LUT, VI6_DPR_LUT_ROUTE },

		{ VI6_DPR_NODE_RPF(0), VI6_DPR_RPF_ROUTE(0) },

		{ VI6_DPR_NODE_RPF(1), VI6_DPR_RPF_ROUTE(1) },

		{ VI6_DPR_NODE_RPF(2), VI6_DPR_RPF_ROUTE(2) },

		{ VI6_DPR_NODE_RPF(3), VI6_DPR_RPF_ROUTE(3) },

		{ VI6_DPR_NODE_RPF(4), VI6_DPR_RPF_ROUTE(4) },

		{ VI6_DPR_NODE_SRU, VI6_DPR_SRU_ROUTE },

		{ VI6_DPR_NODE_UDS(0), VI6_DPR_UDS_ROUTE(0) },

		{ VI6_DPR_NODE_UDS(1), VI6_DPR_UDS_ROUTE(1) },

		{ VI6_DPR_NODE_UDS(2), VI6_DPR_UDS_ROUTE(2) },

		{ VI6_DPR_NODE_WPF(0), 0 },

		{ VI6_DPR_NODE_WPF(1), 0 },

		{ VI6_DPR_NODE_WPF(2), 0 },

		{ VI6_DPR_NODE_WPF(3), 0 },

	};



	unsigned int i;

	unsigned int i;





	for (i = 0; i < ARRAY_SIZE(routes); ++i) {

	for (i = 0; i < ARRAY_SIZE(vsp1_routes); ++i) {

		if (routes[i].id == entity->id) {

		if (vsp1_routes[i].type == entity->type &&

			entity->route = routes[i].reg;

		    vsp1_routes[i].index == entity->index) {

			entity->route = &vsp1_routes[i];

			break;

			break;

		}

		}

	}

	}





	if (i == ARRAY_SIZE(routes))

	if (i == ARRAY_SIZE(vsp1_routes))

		return -EINVAL;

		return -EINVAL;





	entity->vsp1 = vsp1;

	entity->vsp1 = vsp1;

drivers/media/platform/vsp1/vsp1_entity.h

+21 −2
Original line number Original line Diff line number Diff line
@@ -30,13 +30,31 @@ enum vsp1_entity_type { 
	VSP1_ENTITY_WPF,

	VSP1_ENTITY_WPF,

};

};





/*

 * struct vsp1_route - Entity routing configuration

 * @type: Entity type this routing entry is associated with

 * @index: Entity index this routing entry is associated with

 * @reg: Output routing configuration register

 * @inputs: Target node value for each input

 *

 * Each $vsp1_route entry describes routing configuration for the entity

 * specified by the entry's @type and @index. @reg indicates the register that

 * holds output routing configuration for the entity, and the @inputs array

 * store the target node value for each input of the entity.

 */

struct vsp1_route {

	enum vsp1_entity_type type;

	unsigned int index;

	unsigned int reg;

	unsigned int inputs[4];

};



struct vsp1_entity {

struct vsp1_entity {

	struct vsp1_device *vsp1;

	struct vsp1_device *vsp1;





	enum vsp1_entity_type type;

	enum vsp1_entity_type type;

	unsigned int index;

	unsigned int index;

	unsigned int id;

	const struct vsp1_route *route;

	unsigned int route;





	struct list_head list_dev;

	struct list_head list_dev;

	struct list_head list_pipe;

	struct list_head list_pipe;
@@ -45,6 +63,7 @@ struct vsp1_entity { 
	unsigned int source_pad;

	unsigned int source_pad;





	struct media_entity *sink;

	struct media_entity *sink;

	unsigned int sink_pad;





	struct v4l2_subdev subdev;

	struct v4l2_subdev subdev;

	struct v4l2_mbus_framefmt *formats;

	struct v4l2_mbus_framefmt *formats;

drivers/media/platform/vsp1/vsp1_hsit.c

+2 −5
Original line number Original line Diff line number Diff line
@@ -193,13 +193,10 @@ struct vsp1_hsit *vsp1_hsit_create(struct vsp1_device *vsp1, bool inverse) 




	hsit->inverse = inverse;

	hsit->inverse = inverse;





	if (inverse) {

	if (inverse)

		hsit->entity.type = VSP1_ENTITY_HSI;

		hsit->entity.type = VSP1_ENTITY_HSI;

		hsit->entity.id = VI6_DPR_NODE_HSI;

	else

	} else {

		hsit->entity.type = VSP1_ENTITY_HST;

		hsit->entity.type = VSP1_ENTITY_HST;

		hsit->entity.id = VI6_DPR_NODE_HST;

	}





	ret = vsp1_entity_init(vsp1, &hsit->entity, 2);

	ret = vsp1_entity_init(vsp1, &hsit->entity, 2);

	if (ret < 0)

	if (ret < 0)

drivers/media/platform/vsp1/vsp1_lif.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -215,7 +215,6 @@ struct vsp1_lif *vsp1_lif_create(struct vsp1_device *vsp1) 
		return ERR_PTR(-ENOMEM);

		return ERR_PTR(-ENOMEM);





	lif->entity.type = VSP1_ENTITY_LIF;

	lif->entity.type = VSP1_ENTITY_LIF;

	lif->entity.id = VI6_DPR_NODE_LIF;





	ret = vsp1_entity_init(vsp1, &lif->entity, 2);

	ret = vsp1_entity_init(vsp1, &lif->entity, 2);

	if (ret < 0)

	if (ret < 0)

drivers/media/platform/vsp1/vsp1_lut.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -229,7 +229,6 @@ struct vsp1_lut *vsp1_lut_create(struct vsp1_device *vsp1) 
		return ERR_PTR(-ENOMEM);

		return ERR_PTR(-ENOMEM);





	lut->entity.type = VSP1_ENTITY_LUT;

	lut->entity.type = VSP1_ENTITY_LUT;

	lut->entity.id = VI6_DPR_NODE_LUT;





	ret = vsp1_entity_init(vsp1, &lut->entity, 2);

	ret = vsp1_entity_init(vsp1, &lut->entity, 2);

	if (ret < 0)

	if (ret < 0)