drm/panfrost: Fix module unload
Subsystems (3)
Steven Price
maintainerPATCH 1/1 drm/panfrost: Fix module unload
When unloading the call to pm_runtime_put_sync_suspend() will attempt to turn the GPU cores off, however panfrost_device_fini() will have turned the clocks off. This leads to the hardware locking up.
Instead don't call pm_runtime_put_sync_suspend() and instead simply mark the device as suspended using pm_runtime_set_suspended(). And also include this on the error path in panfrost_probe().
--- drivers/gpu/drm/panfrost/panfrost_drv.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/panfrost/panfrost_drv.c +3 -2
@@ -627,6 +627,7 @@ static int panfrost_probe(struct platform_device *pdev) err_out1:pm_runtime_disable (pfdev->dev);panfrost_device_fini (pfdev); +pm_runtime_set_suspended (pfdev->dev); err_out0:drm_dev_put (ddev);return err;
@@ -641,9 +642,9 @@ static int panfrost_remove(struct platform_device *pdev)panfrost_gem_shrinker_cleanup (ddev);pm_runtime_get_sync (pfdev->dev); -panfrost_device_fini (pfdev); -pm_runtime_put_sync_suspend (pfdev->dev);pm_runtime_disable (pfdev->dev); +panfrost_device_fini (pfdev); +pm_runtime_set_suspended (pfdev->dev);drm_dev_put (ddev);return 0 ;
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Looks good, thanks!
Quoted 41 lines · Steven Price
When unloading the call to
pm_runtime_put_sync_suspend()will attempt to turn the GPU cores off, howeverpanfrost_device_fini()will have turned the clocks off. This leads to the hardware locking up.Instead don't call
pm_runtime_put_sync_suspend()and instead simply mark the device as suspended usingpm_runtime_set_suspended(). And also include this on the error path inpanfrost_probe().Fixes aebe8c22a912 ("drm/panfrost: Fix possible suspend in
panfrost_remove")Signed-off-by Steven Price <[email protected]>--- drivers/gpu/drm/panfrost/panfrost_drv.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)drivers/gpu/drm/panfrost/panfrost_drv.c +3
-2@@ -627,6 +627,7 @@ static int panfrost_probe(struct platform_device *pdev) err_out1:pm_runtime_disable (pfdev->dev);panfrost_device_fini (pfdev); +pm_runtime_set_suspended (pfdev->dev); err_out0:drm_dev_put (ddev);return err;@@ -641,9 +642,9 @@ static int panfrost_remove(struct platform_device *pdev)panfrost_gem_shrinker_cleanup (ddev);pm_runtime_get_sync (pfdev->dev); -panfrost_device_fini (pfdev); -pm_runtime_put_sync_suspend (pfdev->dev);pm_runtime_disable (pfdev->dev); +panfrost_device_fini (pfdev); +pm_runtime_set_suspended (pfdev->dev);drm_dev_put (ddev);return 0;
Quoted 8 lines
--
2.20.1_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 10 lines · On Fri, 30 Oct 2020 14:58:33 +0000 Steven Price <[email protected]> wrote:
When unloading the call to
pm_runtime_put_sync_suspend()will attempt to turn the GPU cores off, howeverpanfrost_device_fini()will have turned the clocks off. This leads to the hardware locking up.Instead don't call
pm_runtime_put_sync_suspend()and instead simply mark the device as suspended usingpm_runtime_set_suspended(). And also include this on the error path inpanfrost_probe().Fixes aebe8c22a912 ("drm/panfrost: Fix possible suspend in panfrost_remove")Signed-off-by Steven Price <[email protected]>
Queued to drm-misc-fixes.
Thanks,
Boris
Quoted 18 lines
--- drivers/gpu/drm/panfrost/panfrost_drv.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)drivers/gpu/drm/panfrost/panfrost_drv.c +1
-0@@ -627,6 +627,7 @@ static int panfrost_probe(struct platform_device *pdev) err_out1:pm_runtime_disable (pfdev->dev);panfrost_device_fini (pfdev); +pm_runtime_set_suspended (pfdev->dev); err_out0:drm_dev_put (ddev);return err;@@ -641,9 +642,9 @@ static int panfrost_remove(struct platform_device *pdev)panfrost_gem_shrinker_cleanup (ddev);
drivers/gpu/drm/panfrost/panfrost_drv.c static int panfrost_remove(struct platform_device *pdev) · line 650
Quoted 10 lines
drivers/gpu/drm/panfrost/panfrost_drv.c +2
-2pm_runtime_get_sync (pfdev->dev); -panfrost_device_fini (pfdev); -pm_runtime_put_sync_suspend (pfdev->dev);pm_runtime_disable (pfdev->dev); +panfrost_device_fini (pfdev); +pm_runtime_set_suspended (pfdev->dev);drm_dev_put (ddev);return 0 ;
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel