1 files changed, 32 insertions, 1 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c
index c606e027..0cc29026 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.c
@@ -40,6 +40,7 @@
 #include <linux/clk/tegra.h>
 #include <linux/kthread.h>
 #include <linux/platform/tegra/common.h>
+#include <linux/reset.h>
 
 #include <linux/sched.h>
 
@@ -1166,7 +1167,10 @@ static void gk20a_pm_shutdown(struct platform_device *pdev)
 #endif
 
         /* Be ready for rail-gate after this point */
-        gk20a_pm_prepare_poweroff(&pdev->dev);
+        if (gk20a_gpu_is_virtual(pdev))
+                vgpu_pm_prepare_poweroff(&pdev->dev);
+        else
+                gk20a_pm_prepare_poweroff(&pdev->dev);
 }
 
 #ifdef CONFIG_PM
@@ -1295,6 +1299,10 @@ static int gk20a_pm_init(struct platform_device *dev)
         if (IS_ENABLED(CONFIG_PM_GENERIC_DOMAINS))
                 err = gk20a_pm_initialise_domain(dev);
 
+        platform->reset_control = devm_reset_control_get(&dev->dev, NULL);
+        if (IS_ERR(platform->reset_control))
+                platform->reset_control = NULL;
+
         return err;
 }
 
@@ -1452,6 +1460,10 @@ static int gk20a_probe(struct platform_device *dev)
                 gk20a->timeouts_enabled = true;
         gk20a->ch_wdt_enabled = true;
 
+        gk20a->timeslice_low_priority_us = 1300;
+        gk20a->timeslice_medium_priority_us = 2600;
+        gk20a->timeslice_high_priority_us = 5200;
+
         /* Set up initial power settings. For non-slicon platforms, disable *
          * power features and for silicon platforms, read from platform data */
         gk20a->slcg_enabled =
@@ -1504,6 +1516,25 @@ static int gk20a_probe(struct platform_device *dev)
                                         S_IRUGO|S_IWUSR,
                                         platform->debugfs,
                                         &gk20a->mm.disable_bigpage);
+
+        gk20a->debugfs_timeslice_low_priority_us =
+                        debugfs_create_u32("timeslice_low_priority_us",
+                                        S_IRUGO|S_IWUSR,
+                                        platform->debugfs,
+                                        &gk20a->timeslice_low_priority_us);
+
+        gk20a->debugfs_timeslice_medium_priority_us =
+                        debugfs_create_u32("timeslice_medium_priority_us",
+                                        S_IRUGO|S_IWUSR,
+                                        platform->debugfs,
+                                        &gk20a->timeslice_medium_priority_us);
+
+        gk20a->debugfs_timeslice_high_priority_us =
+                        debugfs_create_u32("timeslice_high_priority_us",
+                                        S_IRUGO|S_IWUSR,
+                                        platform->debugfs,
+                                        &gk20a->timeslice_high_priority_us);
+
         gr_gk20a_debugfs_init(gk20a);
         gk20a_pmu_debugfs_init(dev);
         gk20a_cde_debugfs_init(dev);