On 13.06.2017 01:52, Ben Skeggs wrote:
On 06/09/2017 10:25 PM, Mikko Perttunen wrote:
On Tegra186, powergating is handled by the BPMP power domain provider
and the "legacy" powergating API is not available. Therefore skip
these calls if we are attached to a power domain.
Thanks Mikko,

Taken all 3 patches into my tree.

Thanks!


Ben.


Signed-off-by: Mikko Perttunen <mperttu...@nvidia.com>
---
 drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c 
b/drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c
index 6474bd2a6d07..3d42cdbbe9c0 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c
@@ -51,10 +51,12 @@ nvkm_device_tegra_power_up(struct nvkm_device_tegra *tdev)
        reset_control_assert(tdev->rst);
        udelay(10);

-       ret = tegra_powergate_remove_clamping(TEGRA_POWERGATE_3D);
-       if (ret)
-               goto err_clamp;
-       udelay(10);
+       if (!tdev->pdev->dev.pm_domain) {
+               ret = tegra_powergate_remove_clamping(TEGRA_POWERGATE_3D);
+               if (ret)
+                       goto err_clamp;
+               udelay(10);
+       }

        reset_control_deassert(tdev->rst);
        udelay(10);


_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Reply via email to