diff options
| author | Viresh Kumar <viresh.kumar@linaro.org> | 2020-12-08 08:52:17 +0300 |
|---|---|---|
| committer | Viresh Kumar <viresh.kumar@linaro.org> | 2020-12-08 08:52:17 +0300 |
| commit | c8bb4520543823a9b3da3861304273dc7232e2c7 (patch) | |
| tree | 26670815d56dfc89fbe55e77c8e987324b70f95f /drivers/gpu/drm/panfrost/panfrost_drv.c | |
| parent | f45f89a778e8a61d9c79405e8c716058b6ba12f2 (diff) | |
| parent | f9b0498d29404f230894490d622e57e481c7d45a (diff) | |
| download | linux-c8bb4520543823a9b3da3861304273dc7232e2c7.tar.xz | |
Merge branch 'cpufreq/scmi' into cpufreq/arm/linux-next
Diffstat (limited to 'drivers/gpu/drm/panfrost/panfrost_drv.c')
| -rw-r--r-- | drivers/gpu/drm/panfrost/panfrost_drv.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/panfrost/panfrost_drv.c b/drivers/gpu/drm/panfrost/panfrost_drv.c index 37d4cb7a5491..0fc084110e5b 100644 --- a/drivers/gpu/drm/panfrost/panfrost_drv.c +++ b/drivers/gpu/drm/panfrost/panfrost_drv.c @@ -626,6 +626,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; @@ -640,9 +641,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; |