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

Commit fce34e49 authored by Kieran Bingham's avatar Kieran Bingham Committed by Mauro Carvalho Chehab
Browse files

media: vsp1: Move video suspend resume handling to video object 



The suspend and resume handlers are only utilised by video pipelines,
yet the functions currently reside in the vsp1_pipe object.

This causes an issue with resume, as the functions incorrectly call
vsp1_pipeline_run() directly instead of processing the video object
through vsp1_video_pipeline_run().

Move the functions to the video object, renaming accordingly and update
the resume handler to call vsp1_video_pipeline_run() as appropriate.

Signed-off-by: default avatarKieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 83967993

drivers/media/platform/vsp1/vsp1_drv.c

+2 −2
Original line number Diff line number Diff line
@@ -589,7 +589,7 @@ static int __maybe_unused vsp1_pm_suspend(struct device *dev) 
	 * restarted explicitly by the DU.

	 */

	if (!vsp1->drm)

		vsp1_pipelines_suspend(vsp1);

		vsp1_video_suspend(vsp1);



	pm_runtime_force_suspend(vsp1->dev);
@@ -607,7 +607,7 @@ static int __maybe_unused vsp1_pm_resume(struct device *dev) 
	 * restarted explicitly by the DU.

	 */

	if (!vsp1->drm)

		vsp1_pipelines_resume(vsp1);

		vsp1_video_resume(vsp1);



	return 0;

}

drivers/media/platform/vsp1/vsp1_pipe.c

+0 −70
Original line number Diff line number Diff line
@@ -386,73 +386,3 @@ void vsp1_pipeline_propagate_partition(struct vsp1_pipeline *pipe, 
	}

}

void vsp1_pipelines_suspend(struct vsp1_device *vsp1)

{

	unsigned long flags;

	unsigned int i;

	int ret;



	/*

	 * To avoid increasing the system suspend time needlessly, loop over the

	 * pipelines twice, first to set them all to the stopping state, and

	 * then to wait for the stop to complete.

	 */

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

		struct vsp1_rwpf *wpf = vsp1->wpf[i];

		struct vsp1_pipeline *pipe;



		if (wpf == NULL)

			continue;



		pipe = wpf->entity.pipe;

		if (pipe == NULL)

			continue;



		spin_lock_irqsave(&pipe->irqlock, flags);

		if (pipe->state == VSP1_PIPELINE_RUNNING)

			pipe->state = VSP1_PIPELINE_STOPPING;

		spin_unlock_irqrestore(&pipe->irqlock, flags);

	}



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

		struct vsp1_rwpf *wpf = vsp1->wpf[i];

		struct vsp1_pipeline *pipe;



		if (wpf == NULL)

			continue;



		pipe = wpf->entity.pipe;

		if (pipe == NULL)

			continue;



		ret = wait_event_timeout(pipe->wq, vsp1_pipeline_stopped(pipe),

					 msecs_to_jiffies(500));

		if (ret == 0)

			dev_warn(vsp1->dev, "pipeline %u stop timeout\n",

				 wpf->entity.index);

	}

}



void vsp1_pipelines_resume(struct vsp1_device *vsp1)

{

	unsigned long flags;

	unsigned int i;



	/* Resume all running pipelines. */

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

		struct vsp1_rwpf *wpf = vsp1->wpf[i];

		struct vsp1_pipeline *pipe;



		if (wpf == NULL)

			continue;



		pipe = wpf->entity.pipe;

		if (pipe == NULL)

			continue;



		spin_lock_irqsave(&pipe->irqlock, flags);

		if (vsp1_pipeline_ready(pipe))

			vsp1_pipeline_run(pipe);

		spin_unlock_irqrestore(&pipe->irqlock, flags);

	}

}

drivers/media/platform/vsp1/vsp1_pipe.h

+0 −3
Original line number Diff line number Diff line
@@ -164,9 +164,6 @@ void vsp1_pipeline_propagate_partition(struct vsp1_pipeline *pipe, 
				       unsigned int index,

				       struct vsp1_partition_window *window);



void vsp1_pipelines_suspend(struct vsp1_device *vsp1);

void vsp1_pipelines_resume(struct vsp1_device *vsp1);



const struct vsp1_format_info *vsp1_get_format_info(struct vsp1_device *vsp1,

						    u32 fourcc);

drivers/media/platform/vsp1/vsp1_video.c

+75 −0
Original line number Diff line number Diff line
@@ -1170,6 +1170,81 @@ static const struct v4l2_file_operations vsp1_video_fops = { 
	.mmap = vb2_fop_mmap,

};



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

 * Suspend and Resume

 */



void vsp1_video_suspend(struct vsp1_device *vsp1)

{

	unsigned long flags;

	unsigned int i;

	int ret;



	/*

	 * To avoid increasing the system suspend time needlessly, loop over the

	 * pipelines twice, first to set them all to the stopping state, and

	 * then to wait for the stop to complete.

	 */

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

		struct vsp1_rwpf *wpf = vsp1->wpf[i];

		struct vsp1_pipeline *pipe;



		if (wpf == NULL)

			continue;



		pipe = wpf->entity.pipe;

		if (pipe == NULL)

			continue;



		spin_lock_irqsave(&pipe->irqlock, flags);

		if (pipe->state == VSP1_PIPELINE_RUNNING)

			pipe->state = VSP1_PIPELINE_STOPPING;

		spin_unlock_irqrestore(&pipe->irqlock, flags);

	}



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

		struct vsp1_rwpf *wpf = vsp1->wpf[i];

		struct vsp1_pipeline *pipe;



		if (wpf == NULL)

			continue;



		pipe = wpf->entity.pipe;

		if (pipe == NULL)

			continue;



		ret = wait_event_timeout(pipe->wq, vsp1_pipeline_stopped(pipe),

					 msecs_to_jiffies(500));

		if (ret == 0)

			dev_warn(vsp1->dev, "pipeline %u stop timeout\n",

				 wpf->entity.index);

	}

}



void vsp1_video_resume(struct vsp1_device *vsp1)

{

	unsigned long flags;

	unsigned int i;



	/* Resume all running pipelines. */

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

		struct vsp1_rwpf *wpf = vsp1->wpf[i];

		struct vsp1_pipeline *pipe;



		if (wpf == NULL)

			continue;



		pipe = wpf->entity.pipe;

		if (pipe == NULL)

			continue;



		spin_lock_irqsave(&pipe->irqlock, flags);

		if (vsp1_pipeline_ready(pipe))

			vsp1_video_pipeline_run(pipe);

		spin_unlock_irqrestore(&pipe->irqlock, flags);

	}

}



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

 * Initialization and Cleanup

 */

drivers/media/platform/vsp1/vsp1_video.h

+3 −0
Original line number Diff line number Diff line
@@ -51,6 +51,9 @@ static inline struct vsp1_video *to_vsp1_video(struct video_device *vdev) 
	return container_of(vdev, struct vsp1_video, video);

}



void vsp1_video_suspend(struct vsp1_device *vsp1);

void vsp1_video_resume(struct vsp1_device *vsp1);



struct vsp1_video *vsp1_video_create(struct vsp1_device *vsp1,

				     struct vsp1_rwpf *rwpf);

void vsp1_video_cleanup(struct vsp1_video *video);