4 files changed, 3 insertions, 47 deletions

diff --git a/drivers/gpu/nvgpu/gm20b/debug_gm20b.c b/drivers/gpu/nvgpu/gm20b/debug_gm20b.c
deleted file mode 100644
index b266200c..00000000
--- a/drivers/gpu/nvgpu/gm20b/debug_gm20b.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (C) 2015 NVIDIA Corporation.  All rights reserved.
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
-
-#include "gk20a/gk20a.h"
-#include "debug_gm20b.h"
-
-void gm20b_init_debug_ops(struct gpu_ops *gops)
-{
-        gops->debug.show_dump = gk20a_debug_show_dump;
-}
diff --git a/drivers/gpu/nvgpu/gm20b/debug_gm20b.h b/drivers/gpu/nvgpu/gm20b/debug_gm20b.h
deleted file mode 100644
index c3c5fed6..00000000
--- a/drivers/gpu/nvgpu/gm20b/debug_gm20b.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * GM20B Debug functionality
- *
- * Copyright (C) 2015 NVIDIA CORPORATION.  All rights reserved.
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
-
-#ifndef _DEBUG_GM20B_H_
-#define _DEBUG_GM20B_H_
-
-struct gpu_ops;
-
-void gm20b_init_debug_ops(struct gpu_ops *gops);
-
-#endif
diff --git a/drivers/gpu/nvgpu/gm20b/gr_gm20b.c b/drivers/gpu/nvgpu/gm20b/gr_gm20b.c
index 82c587f9..c6e451e1 100644
--- a/drivers/gpu/nvgpu/gm20b/gr_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/gr_gm20b.c
@@ -20,6 +20,7 @@
 #include <nvgpu/kmem.h>
 #include <nvgpu/log.h>
 #include <nvgpu/enabled.h>
+#include <nvgpu/debug.h>
 
 #include "gk20a/gk20a.h"
 #include "gk20a/gr_gk20a.h"
diff --git a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
index f5328f03..831fd5da 100644
--- a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
@@ -33,11 +33,11 @@
 #include "clk_gm20b.h"
 #include "mc_gm20b.h"
 #include "regops_gm20b.h"
-#include "debug_gm20b.h"
 #include "cde_gm20b.h"
 #include "therm_gm20b.h"
 #include "hal_gm20b.h"
 
+#include <nvgpu/debug.h>
 #include <nvgpu/bug.h>
 #include <nvgpu/enabled.h>
 
@@ -234,7 +234,7 @@ int gm20b_init_hal(struct gk20a *g)
         gm20b_init_pmu_ops(gops);
         gm20b_init_clk_ops(gops);
         gm20b_init_regops(gops);
-        gm20b_init_debug_ops(gops);
+        gk20a_init_debug_ops(gops);
         gk20a_init_dbg_session_ops(gops);
         gm20b_init_cde_ops(gops);
         gm20b_init_therm_ops(gops);