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

Commit aebe8c22 authored by Rob Herring's avatar Rob Herring
Browse files

drm/panfrost: Fix possible suspend in panfrost_remove 



Calls to panfrost_device_fini() access the h/w, but we already done a
pm_runtime_put_sync_autosuspend() beforehand. This only works if the
autosuspend delay is long enough. A 0ms delay will hang the system when
removing the device. Fix this by moving the pm_runtime_put_sync_suspend()
after the panfrost_device_fini() call.

Cc: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Signed-off-by: default avatarRob Herring <robh@kernel.org>
Reviewed-by: default avatarSteven Price <steven.price@arm.com>
Acked-by: default avatarAlyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190823021216.5862-2-robh@kernel.org
parent c90f3081

drivers/gpu/drm/panfrost/panfrost_drv.c

+4 −2
Original line number Diff line number Diff line
@@ -570,11 +570,13 @@ static int panfrost_remove(struct platform_device *pdev) 


	drm_dev_unregister(ddev);

	panfrost_gem_shrinker_cleanup(ddev);



	pm_runtime_get_sync(pfdev->dev);

	pm_runtime_put_sync_autosuspend(pfdev->dev);

	pm_runtime_disable(pfdev->dev);

	panfrost_devfreq_fini(pfdev);

	panfrost_device_fini(pfdev);

	pm_runtime_put_sync_suspend(pfdev->dev);

	pm_runtime_disable(pfdev->dev);



	drm_dev_put(ddev);

	return 0;

}