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

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

[media] v4l: vsp1: Simplify frame end processing 



The DRM pipeline, as it runs in automatic restart mode, never sees the
pipeline state set to VSP1_PIPELINE_STOPPING or VSP1_PIPELINE_STOPPED
when running the frame end interrupt handler. We can thus skip the
checks various checks in the handler and return immediately.

Similarly the DRM frame end handler calls vsp1_pipeline_run()
unnecessarily, as the state there is never VSP1_PIPELINE_STOPPED. Remove
the function call and the frame end handler is it's now empty.

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

drivers/media/platform/vsp1/vsp1_drm.c

+0 −15
Original line number Diff line number Diff line
@@ -26,20 +26,6 @@ 
#include "vsp1_pipe.h"

#include "vsp1_rwpf.h"



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

 * Runtime Handling

 */



static void vsp1_drm_pipeline_frame_end(struct vsp1_pipeline *pipe)

{

	unsigned long flags;



	spin_lock_irqsave(&pipe->irqlock, flags);

	if (pipe->num_inputs)

		vsp1_pipeline_run(pipe);

	spin_unlock_irqrestore(&pipe->irqlock, flags);

}



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

 * DU Driver API

 */
@@ -569,7 +555,6 @@ int vsp1_drm_init(struct vsp1_device *vsp1) 
	pipe = &vsp1->drm->pipe;



	vsp1_pipeline_init(pipe);

	pipe->frame_end = vsp1_drm_pipeline_frame_end;



	/* The DRM pipeline is static, add entities manually. */

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

drivers/media/platform/vsp1/vsp1_pipe.c

+6 −3
Original line number Diff line number Diff line
@@ -289,6 +289,7 @@ void vsp1_pipeline_frame_end(struct vsp1_pipeline *pipe) 
		vsp1_dl_irq_frame_end(pipe->dl);



	/* Signal frame end to the pipeline handler. */

	if (pipe->frame_end)

		pipe->frame_end(pipe);



	spin_lock_irqsave(&pipe->irqlock, flags);
@@ -298,7 +299,9 @@ void vsp1_pipeline_frame_end(struct vsp1_pipeline *pipe) 
	/* When using display lists in continuous frame mode the pipeline is

	 * automatically restarted by the hardware.

	 */

	if (!pipe->dl)

	if (pipe->dl)

		goto done;



	pipe->state = VSP1_PIPELINE_STOPPED;



	/* If a stop has been requested, mark the pipeline as stopped and