UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/tegra: vic: Stop channel on suspend 

CDMA must be stopped before hardware is suspended. Add channel stopping
to RPM suspend callback. Add system level suspend-resume callbacks.

Runtime PM initialization is moved to host1x client init phase because
RPM callback now uses host1x channel that is available only when host1x
client is registered.

Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
This commit is contained in:
Dmitry Osipenko 2021-12-01 02:23:22 +03:00 committed by Thierry Reding
parent 2421b20d65
commit 1e15f5b911
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
drivers/gpu/drm/tegra/vic.c
View File

@ -152,9 +152,13 @@ static int vic_init(struct host1x_client *client)
goto free_channel; goto free_channel;
} }
pm_runtime_enable(client->dev);
pm_runtime_use_autosuspend(client->dev);
pm_runtime_set_autosuspend_delay(client->dev, 500);
err = tegra_drm_register_client(tegra, drm); err = tegra_drm_register_client(tegra, drm);
if (err < 0) if (err < 0)
goto free_syncpt; goto disable_rpm;
/* /*
* Inherit the DMA parameters (such as maximum segment size) from the * Inherit the DMA parameters (such as maximum segment size) from the
@ -164,7 +168,10 @@ static int vic_init(struct host1x_client *client)
return 0; return 0;
free_syncpt: disable_rpm:
pm_runtime_dont_use_autosuspend(client->dev);
pm_runtime_force_suspend(client->dev);
host1x_syncpt_put(client->syncpts[0]); host1x_syncpt_put(client->syncpts[0]);
free_channel: free_channel:
host1x_channel_put(vic->channel); host1x_channel_put(vic->channel);
@ -189,10 +196,15 @@ static int vic_exit(struct host1x_client *client)
if (err < 0) if (err < 0)
return err; return err;
pm_runtime_dont_use_autosuspend(client->dev);
pm_runtime_force_suspend(client->dev);
host1x_syncpt_put(client->syncpts[0]); host1x_syncpt_put(client->syncpts[0]);
host1x_channel_put(vic->channel); host1x_channel_put(vic->channel);
host1x_client_iommu_detach(client); host1x_client_iommu_detach(client);
vic->channel = NULL;
if (client->group) { if (client->group) {
dma_unmap_single(vic->dev, vic->falcon.firmware.phys, dma_unmap_single(vic->dev, vic->falcon.firmware.phys,
vic->falcon.firmware.size, DMA_TO_DEVICE); vic->falcon.firmware.size, DMA_TO_DEVICE);
@ -316,6 +328,8 @@ static int vic_runtime_suspend(struct device *dev)
struct vic *vic = dev_get_drvdata(dev); struct vic *vic = dev_get_drvdata(dev);
int err; int err;
host1x_channel_stop(vic->channel);
err = reset_control_assert(vic->rst); err = reset_control_assert(vic->rst);
if (err < 0) if (err < 0)
return err; return err;
@ -483,19 +497,8 @@ static int vic_probe(struct platform_device *pdev)
goto exit_falcon; goto exit_falcon;
} }
pm_runtime_enable(&pdev->dev);
if (!pm_runtime_enabled(&pdev->dev)) {
err = vic_runtime_resume(&pdev->dev);
if (err < 0)
goto unregister_client;
}
pm_runtime_set_autosuspend_delay(&pdev->dev, 500);
pm_runtime_use_autosuspend(&pdev->dev);
return 0; return 0;
unregister_client:
host1x_client_unregister(&vic->client.base);
exit_falcon: exit_falcon:
falcon_exit(&vic->falcon); falcon_exit(&vic->falcon);
@ -514,11 +517,6 @@ static int vic_remove(struct platform_device *pdev)
return err; return err;
} }
if (pm_runtime_enabled(&pdev->dev))
pm_runtime_disable(&pdev->dev);
else
vic_runtime_suspend(&pdev->dev);
falcon_exit(&vic->falcon); falcon_exit(&vic->falcon);
return 0; return 0;
@ -526,6 +524,8 @@ static int vic_remove(struct platform_device *pdev)
static const struct dev_pm_ops vic_pm_ops = { static const struct dev_pm_ops vic_pm_ops = {
SET_RUNTIME_PM_OPS(vic_runtime_suspend, vic_runtime_resume, NULL) SET_RUNTIME_PM_OPS(vic_runtime_suspend, vic_runtime_resume, NULL)
SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,
pm_runtime_force_resume)
}; };
struct platform_driver tegra_vic_driver = { struct platform_driver tegra_vic_driver = {