Commit a17d2d6c authored Dec 04, 2017 by Kieran Bingham Committed by Mauro Carvalho Chehab Dec 08, 2017

media: vsp1: Prevent suspending and resuming DRM pipelines



When used as part of a display pipeline, the VSP is stopped and
restarted explicitly by the DU from its suspend and resume handlers.
There is thus no need to stop or restart pipelines in the VSP suspend
and resume handlers, and doing so would cause the hardware to be
left in a misconfigured state.

Ensure that the VSP suspend and resume handlers do not affect DRM-based
pipelines.

Signed-off-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

parent 2c21ac0a

drivers/media/platform/vsp1/vsp1_drv.c

+14 −2

Original line number	Diff line number	Diff line
		@@ -571,7 +571,13 @@ static int __maybe_unused vsp1_pm_suspend(struct device *dev)
		{
		struct vsp1_device *vsp1 = dev_get_drvdata(dev);

		/*
		* When used as part of a display pipeline, the VSP is stopped and
		* restarted explicitly by the DU.
		*/
		if (!vsp1->drm)
		vsp1_pipelines_suspend(vsp1);

		pm_runtime_force_suspend(vsp1->dev);

		return 0;
		@@ -582,6 +588,12 @@ static int __maybe_unused vsp1_pm_resume(struct device *dev)
		struct vsp1_device *vsp1 = dev_get_drvdata(dev);

		pm_runtime_force_resume(vsp1->dev);

		/*
		* When used as part of a display pipeline, the VSP is stopped and
		* restarted explicitly by the DU.
		*/
		if (!vsp1->drm)
		vsp1_pipelines_resume(vsp1);

		return 0;

Admin message