[PATCH v3 2/2] drm/tegra: gr2d/gr3d: Contain PM in the gr*d_probe/gr*d_remove

[Svyatoslav Ryhel]

From: Ion Agorria <i...@agorria.com>

The current power management configuration causes GR2G/GR3D to malfunction
after resume. Reconfigure all PM actions to be handled within the GR*D
probe and remove operations to address this.

Fixes: 62fa0a985e2c ("drm/tegra: Enable runtime PM during probe")
Acked-by: Mikko Perttunen <mperttu...@nvidia.com>
Signed-off-by: Ion Agorria <i...@agorria.com>
Signed-off-by: Svyatoslav Ryhel <clamo...@gmail.com>
---
 drivers/gpu/drm/tegra/gr2d.c | 13 ++++++-------
 drivers/gpu/drm/tegra/gr3d.c | 13 ++++++-------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/drivers/gpu/drm/tegra/gr2d.c b/drivers/gpu/drm/tegra/gr2d.c
index e4148b034af7..892e3450b281 100644
--- a/drivers/gpu/drm/tegra/gr2d.c
+++ b/drivers/gpu/drm/tegra/gr2d.c
@@ -100,9 +100,6 @@ static int gr2d_exit(struct host1x_client *client)
        if (err < 0)
                return err;
 
-       pm_runtime_dont_use_autosuspend(client->dev);
-       pm_runtime_force_suspend(client->dev);
-
        host1x_client_iommu_detach(client);
        host1x_syncpt_put(client->syncpts[0]);
        host1x_channel_put(gr2d->channel);
@@ -280,12 +277,18 @@ static int gr2d_probe(struct platform_device *pdev)
        for (i = 0; i < ARRAY_SIZE(gr2d_addr_regs); i++)
                set_bit(gr2d_addr_regs[i], gr2d->addr_regs);
 
+       pm_runtime_enable(dev);
+
        err = host1x_client_register(&gr2d->client.base);
        if (err < 0) {
+               pm_runtime_disable(dev);
                dev_err(dev, "failed to register host1x client: %d\n", err);
                return err;
        }
 
+       pm_runtime_use_autosuspend(dev);
+       pm_runtime_set_autosuspend_delay(dev, 500);
+
        return 0;
 }
 
@@ -367,10 +370,6 @@ static int __maybe_unused gr2d_runtime_resume(struct 
device *dev)
                goto disable_clk;
        }
 
-       pm_runtime_enable(dev);
-       pm_runtime_use_autosuspend(dev);
-       pm_runtime_set_autosuspend_delay(dev, 500);
-
        return 0;
 
 disable_clk:
diff --git a/drivers/gpu/drm/tegra/gr3d.c b/drivers/gpu/drm/tegra/gr3d.c
index 47b0c6c56bfd..388e47943d5e 100644
--- a/drivers/gpu/drm/tegra/gr3d.c
+++ b/drivers/gpu/drm/tegra/gr3d.c
@@ -109,9 +109,6 @@ static int gr3d_exit(struct host1x_client *client)
        if (err < 0)
                return err;
 
-       pm_runtime_dont_use_autosuspend(client->dev);
-       pm_runtime_force_suspend(client->dev);
-
        host1x_client_iommu_detach(client);
        host1x_syncpt_put(client->syncpts[0]);
        host1x_channel_put(gr3d->channel);
@@ -510,13 +507,19 @@ static int gr3d_probe(struct platform_device *pdev)
        for (i = 0; i < ARRAY_SIZE(gr3d_addr_regs); i++)
                set_bit(gr3d_addr_regs[i], gr3d->addr_regs);
 
+       pm_runtime_enable(&pdev->dev);
+
        err = host1x_client_register(&gr3d->client.base);
        if (err < 0) {
+               pm_runtime_disable(&pdev->dev);
                dev_err(&pdev->dev, "failed to register host1x client: %d\n",
                        err);
                return err;
        }
 
+       pm_runtime_use_autosuspend(&pdev->dev);
+       pm_runtime_set_autosuspend_delay(&pdev->dev, 500);
+
        return 0;
 }
 
@@ -578,10 +581,6 @@ static int __maybe_unused gr3d_runtime_resume(struct 
device *dev)
                goto disable_clk;
        }
 
-       pm_runtime_enable(dev);
-       pm_runtime_use_autosuspend(dev);
-       pm_runtime_set_autosuspend_delay(dev, 500);
-
        return 0;
 
 disable_clk:
-- 
2.51.0