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

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

[media] v4l: vsp1: Make pipeline inputs array index by RPF index 



The pipeline inputs array stores pointers to all RPFs contained in the
pipeline. It's currently indexed contiguously by adding RPFs in the
order they are found during graph walk. This can't easily support
dynamic addition and removal of RPFs while streaming, which will be
required for combined VSP+DU support.

Make the array indexed by RPF index instead and skip NULL elements when
iterating over RPFs.

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

drivers/media/platform/vsp1/vsp1_pipe.c

+5 −1
Original line number Original line Diff line number Diff line
@@ -161,14 +161,18 @@ const struct vsp1_format_info *vsp1_get_format_info(u32 fourcc) 




void vsp1_pipeline_reset(struct vsp1_pipeline *pipe)

void vsp1_pipeline_reset(struct vsp1_pipeline *pipe)

{

{

	unsigned int i;



	if (pipe->bru) {

	if (pipe->bru) {

		struct vsp1_bru *bru = to_bru(&pipe->bru->subdev);

		struct vsp1_bru *bru = to_bru(&pipe->bru->subdev);

		unsigned int i;





		for (i = 0; i < ARRAY_SIZE(bru->inputs); ++i)

		for (i = 0; i < ARRAY_SIZE(bru->inputs); ++i)

			bru->inputs[i].rpf = NULL;

			bru->inputs[i].rpf = NULL;

	}

	}





	for (i = 0; i < ARRAY_SIZE(pipe->inputs); ++i)

		pipe->inputs[i] = NULL;



	INIT_LIST_HEAD(&pipe->entities);

	INIT_LIST_HEAD(&pipe->entities);

	pipe->state = VSP1_PIPELINE_STOPPED;

	pipe->state = VSP1_PIPELINE_STOPPED;

	pipe->buffers_ready = 0;

	pipe->buffers_ready = 0;

drivers/media/platform/vsp1/vsp1_pipe.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -66,7 +66,7 @@ enum vsp1_pipeline_state { 
 * @stream_count: number of streaming video nodes

 * @stream_count: number of streaming video nodes

 * @buffers_ready: bitmask of RPFs and WPFs with at least one buffer available

 * @buffers_ready: bitmask of RPFs and WPFs with at least one buffer available

 * @num_inputs: number of RPFs

 * @num_inputs: number of RPFs

 * @inputs: array of RPFs in the pipeline

 * @inputs: array of RPFs in the pipeline (indexed by RPF index)

 * @output: WPF at the output of the pipeline

 * @output: WPF at the output of the pipeline

 * @bru: BRU entity, if present

 * @bru: BRU entity, if present

 * @lif: LIF entity, if present

 * @lif: LIF entity, if present

drivers/media/platform/vsp1/vsp1_video.c

+12 −4
Original line number Original line Diff line number Diff line
@@ -298,8 +298,8 @@ static int vsp1_video_pipeline_validate(struct vsp1_pipeline *pipe, 




		if (e->type == VSP1_ENTITY_RPF) {

		if (e->type == VSP1_ENTITY_RPF) {

			rwpf = to_rwpf(subdev);

			rwpf = to_rwpf(subdev);

			pipe->inputs[pipe->num_inputs++] = rwpf;

			pipe->inputs[rwpf->entity.index] = rwpf;

			rwpf->video->pipe_index = pipe->num_inputs;

			rwpf->video->pipe_index = ++pipe->num_inputs;

		} else if (e->type == VSP1_ENTITY_WPF) {

		} else if (e->type == VSP1_ENTITY_WPF) {

			rwpf = to_rwpf(subdev);

			rwpf = to_rwpf(subdev);

			pipe->output = rwpf;

			pipe->output = rwpf;
@@ -324,7 +324,10 @@ static int vsp1_video_pipeline_validate(struct vsp1_pipeline *pipe, 
	/* Follow links downstream for each input and make sure the graph

	/* Follow links downstream for each input and make sure the graph

	 * contains no loop and that all branches end at the output WPF.

	 * contains no loop and that all branches end at the output WPF.

	 */

	 */

	for (i = 0; i < pipe->num_inputs; ++i) {

	for (i = 0; i < video->vsp1->pdata.rpf_count; ++i) {

		if (!pipe->inputs[i])

			continue;



		ret = vsp1_video_pipeline_validate_branch(pipe, pipe->inputs[i],

		ret = vsp1_video_pipeline_validate_branch(pipe, pipe->inputs[i],

							  pipe->output);

							  pipe->output);

		if (ret < 0)

		if (ret < 0)
@@ -449,11 +452,16 @@ static void vsp1_video_frame_end(struct vsp1_pipeline *pipe, 




static void vsp1_video_pipeline_frame_end(struct vsp1_pipeline *pipe)

static void vsp1_video_pipeline_frame_end(struct vsp1_pipeline *pipe)

{

{

	struct vsp1_device *vsp1 = pipe->output->entity.vsp1;

	unsigned int i;

	unsigned int i;





	/* Complete buffers on all video nodes. */

	/* Complete buffers on all video nodes. */

	for (i = 0; i < pipe->num_inputs; ++i)

	for (i = 0; i < vsp1->pdata.rpf_count; ++i) {

		if (!pipe->inputs[i])

			continue;



		vsp1_video_frame_end(pipe, pipe->inputs[i]);

		vsp1_video_frame_end(pipe, pipe->inputs[i]);

	}





	if (!pipe->lif)

	if (!pipe->lif)

		vsp1_video_frame_end(pipe, pipe->output);

		vsp1_video_frame_end(pipe, pipe->output);

drivers/media/platform/vsp1/vsp1_wpf.c

+4 −1
Original line number Original line Diff line number Diff line
@@ -97,9 +97,12 @@ static int wpf_s_stream(struct v4l2_subdev *subdev, int enable) 
	 * inputs as sub-layers and select the virtual RPF as the master

	 * inputs as sub-layers and select the virtual RPF as the master

	 * layer.

	 * layer.

	 */

	 */

	for (i = 0; i < pipe->num_inputs; ++i) {

	for (i = 0; i < vsp1->pdata.rpf_count; ++i) {

		struct vsp1_rwpf *input = pipe->inputs[i];

		struct vsp1_rwpf *input = pipe->inputs[i];





		if (!input)

			continue;



		srcrpf |= (!pipe->bru && pipe->num_inputs == 1)

		srcrpf |= (!pipe->bru && pipe->num_inputs == 1)

			? VI6_WPF_SRCRPF_RPF_ACT_MST(input->entity.index)

			? VI6_WPF_SRCRPF_RPF_ACT_MST(input->entity.index)

			: VI6_WPF_SRCRPF_RPF_ACT_SUB(input->entity.index);

			: VI6_WPF_SRCRPF_RPF_ACT_SUB(input->entity.index);