diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c index dfc7d34c..7ac600c0 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gk20a.c | |||
@@ -747,21 +747,6 @@ static int gk20a_detect_chip(struct gk20a *g) | |||
747 | return gpu_init_hal(g); | 747 | return gpu_init_hal(g); |
748 | } | 748 | } |
749 | 749 | ||
750 | static void gk20a_pm_restore_debug_setting(struct gk20a *g) | ||
751 | { | ||
752 | u32 mmu_debug_ctrl; | ||
753 | |||
754 | /* restore mmu debug state */ | ||
755 | if (g->mmu_debug_ctrl) | ||
756 | mmu_debug_ctrl = fb_mmu_debug_ctrl_debug_enabled_v(); | ||
757 | else | ||
758 | mmu_debug_ctrl = fb_mmu_debug_ctrl_debug_disabled_v(); | ||
759 | |||
760 | mmu_debug_ctrl = gk20a_readl(g, fb_mmu_debug_ctrl_r()); | ||
761 | mmu_debug_ctrl = set_field(mmu_debug_ctrl, fb_mmu_debug_ctrl_debug_m(), mmu_debug_ctrl); | ||
762 | gk20a_writel(g, fb_mmu_debug_ctrl_r(), mmu_debug_ctrl); | ||
763 | } | ||
764 | |||
765 | static int gk20a_pm_finalize_poweron(struct device *dev) | 750 | static int gk20a_pm_finalize_poweron(struct device *dev) |
766 | { | 751 | { |
767 | struct platform_device *pdev = to_platform_device(dev); | 752 | struct platform_device *pdev = to_platform_device(dev); |
@@ -890,7 +875,7 @@ static int gk20a_pm_finalize_poweron(struct device *dev) | |||
890 | } | 875 | } |
891 | 876 | ||
892 | /* Restore the debug setting */ | 877 | /* Restore the debug setting */ |
893 | gk20a_pm_restore_debug_setting(g); | 878 | g->ops.mm.set_debug_mode(g, g->mmu_debug_ctrl); |
894 | 879 | ||
895 | gk20a_channel_resume(g); | 880 | gk20a_channel_resume(g); |
896 | set_user_nice(current, nice_value); | 881 | set_user_nice(current, nice_value); |