1 files changed, 20 insertions, 0 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c
index 67aa49c6..3389aca5 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.c
@@ -56,6 +56,8 @@
 #include "hw_sim_gk20a.h"
 #include "hw_top_gk20a.h"
 #include "hw_ltc_gk20a.h"
+#include "hw_gr_gk20a.h"
+#include "hw_fb_gk20a.h"
 #include "gk20a_scale.h"
 #include "dbg_gpu_gk20a.h"
 #include "hal.h"
@@ -727,6 +729,21 @@ static int gk20a_detect_chip(struct gk20a *g)
         return gpu_init_hal(g);
 }
 
+void gk20a_pm_restore_debug_setting(struct gk20a *g)
+{
+        u32 mmu_debug_ctrl;
+
+        /* restore mmu debug state */
+        if (g->mmu_debug_ctrl)
+                mmu_debug_ctrl = fb_mmu_debug_ctrl_debug_enabled_v();
+        else
+                mmu_debug_ctrl = fb_mmu_debug_ctrl_debug_disabled_v();
+
+        mmu_debug_ctrl = gk20a_readl(g, fb_mmu_debug_ctrl_r());
+        mmu_debug_ctrl = set_field(mmu_debug_ctrl, fb_mmu_debug_ctrl_debug_m(), mmu_debug_ctrl);
+        gk20a_writel(g, fb_mmu_debug_ctrl_r(), mmu_debug_ctrl);
+}
+
 static int gk20a_pm_finalize_poweron(struct device *dev)
 {
         struct platform_device *pdev = to_platform_device(dev);
@@ -851,6 +868,9 @@ static int gk20a_pm_finalize_poweron(struct device *dev)
                 goto done;
         }
 
+        /* Restore the debug setting */
+        gk20a_pm_restore_debug_setting(g);
+
         gk20a_channel_resume(g);
         set_user_nice(current, nice_value);