11 files changed, 36 insertions, 3 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h
index 6f99b3f9..06739eee 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.h
@@ -515,6 +515,9 @@ struct gpu_ops {
                 void (*pg_gr_load_gating_prod)(struct gk20a *g, bool prod);
         } clock_gating;
         struct {
+                void (*post_events)(struct channel_gk20a *ch);
+        } debugger;
+        struct {
                 int (*init_fifo_setup_hw)(struct gk20a *g);
                 void (*bind_channel)(struct channel_gk20a *ch_gk20a);
                 void (*unbind_channel)(struct channel_gk20a *ch_gk20a);
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
index 07185db2..068eb070 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
@@ -6053,7 +6053,7 @@ int gk20a_gr_isr(struct gk20a *g)
                         /* signal clients waiting on an event */
                         if (g->ops.gr.sm_debugger_attached(g) &&
                                          post_event && fault_ch) {
-                                gk20a_dbg_gpu_post_events(fault_ch);
+                                g->ops.debugger.post_events(fault_ch);
                         }
                 }
 
diff --git a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
index e390e4dd..8df66151 100644
--- a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
@@ -556,6 +556,9 @@ static const struct gpu_ops gm20b_ops = {
         .debug = {
                 .show_dump = gk20a_debug_show_dump,
         },
+        .debugger = {
+                .post_events = gk20a_dbg_gpu_post_events,
+        },
         .dbg_session_ops = {
                 .exec_reg_ops = exec_regops_gk20a,
                 .dbg_set_powergate = dbg_set_powergate,
@@ -628,6 +631,7 @@ int gm20b_init_hal(struct gk20a *g)
         gops->mc = gm20b_ops.mc;
         gops->dbg_session_ops = gm20b_ops.dbg_session_ops;
         gops->debug = gm20b_ops.debug;
+        gops->debugger = gm20b_ops.debugger;
         gops->bus = gm20b_ops.bus;
 #if defined(CONFIG_GK20A_CYCLE_STATS)
         gops->css = gm20b_ops.css;
diff --git a/drivers/gpu/nvgpu/gp106/hal_gp106.c b/drivers/gpu/nvgpu/gp106/hal_gp106.c
index 82ef0461..35e4a7dd 100644
--- a/drivers/gpu/nvgpu/gp106/hal_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/hal_gp106.c
@@ -668,6 +668,9 @@ static const struct gpu_ops gp106_ops = {
         .debug = {
                 .show_dump = gk20a_debug_show_dump,
         },
+        .debugger = {
+                .post_events = gk20a_dbg_gpu_post_events,
+        },
         .dbg_session_ops = {
                 .exec_reg_ops = exec_regops_gk20a,
                 .dbg_set_powergate = dbg_set_powergate,
@@ -762,6 +765,7 @@ int gp106_init_hal(struct gk20a *g)
         gops->regops = gp106_ops.regops;
         gops->mc = gp106_ops.mc;
         gops->debug = gp106_ops.debug;
+        gops->debugger = gp106_ops.debugger;
         gops->dbg_session_ops = gp106_ops.dbg_session_ops;
         gops->bus = gp106_ops.bus;
 #if defined(CONFIG_GK20A_CYCLE_STATS)
diff --git a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c
index 6c145c00..0178abbf 100644
--- a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c
@@ -2032,7 +2032,7 @@ int gr_gp10b_handle_fecs_error(struct gk20a *g,
                 }
 
                 /* Post events to UMD */
-                gk20a_dbg_gpu_post_events(ch);
+                g->ops.debugger.post_events(ch);
 
                 tsg = &g->fifo.tsg[ch->tsgid];
 
diff --git a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c
index 783dfcdd..ced3bb40 100644
--- a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c
@@ -602,6 +602,9 @@ static const struct gpu_ops gp10b_ops = {
         .debug = {
                 .show_dump = gk20a_debug_show_dump,
         },
+        .debugger = {
+                .post_events = gk20a_dbg_gpu_post_events,
+        },
         .dbg_session_ops = {
                 .exec_reg_ops = exec_regops_gk20a,
                 .dbg_set_powergate = dbg_set_powergate,
@@ -665,6 +668,7 @@ int gp10b_init_hal(struct gk20a *g)
         gops->regops = gp10b_ops.regops;
         gops->mc = gp10b_ops.mc;
         gops->debug = gp10b_ops.debug;
+        gops->debugger = gp10b_ops.debugger;
         gops->dbg_session_ops = gp10b_ops.dbg_session_ops;
         gops->bus = gp10b_ops.bus;
 #if defined(CONFIG_GK20A_CYCLE_STATS)
diff --git a/drivers/gpu/nvgpu/gv100/hal_gv100.c b/drivers/gpu/nvgpu/gv100/hal_gv100.c
index 677f2a89..dffacdf7 100644
--- a/drivers/gpu/nvgpu/gv100/hal_gv100.c
+++ b/drivers/gpu/nvgpu/gv100/hal_gv100.c
@@ -678,6 +678,9 @@ static const struct gpu_ops gv100_ops = {
         .debug = {
                 .show_dump = gk20a_debug_show_dump,
         },
+        .debugger = {
+                .post_events = gk20a_dbg_gpu_post_events,
+        },
         .dbg_session_ops = {
                 .exec_reg_ops = exec_regops_gk20a,
                 .dbg_set_powergate = dbg_set_powergate,
@@ -770,6 +773,7 @@ int gv100_init_hal(struct gk20a *g)
         gops->regops = gv100_ops.regops;
         gops->mc = gv100_ops.mc;
         gops->debug = gv100_ops.debug;
+        gops->debugger = gv100_ops.debugger;
         gops->dbg_session_ops = gv100_ops.dbg_session_ops;
         gops->bus = gv100_ops.bus;
 #if defined(CONFIG_GK20A_CYCLE_STATS)
diff --git a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c
index d55d51ba..2cc2d53a 100644
--- a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c
@@ -667,6 +667,9 @@ static const struct gpu_ops gv11b_ops = {
         .debug = {
                 .show_dump = gk20a_debug_show_dump,
         },
+        .debugger = {
+                .post_events = gk20a_dbg_gpu_post_events,
+        },
         .dbg_session_ops = {
                 .exec_reg_ops = exec_regops_gk20a,
                 .dbg_set_powergate = dbg_set_powergate,
@@ -729,6 +732,7 @@ int gv11b_init_hal(struct gk20a *g)
         gops->regops = gv11b_ops.regops;
         gops->mc = gv11b_ops.mc;
         gops->debug = gv11b_ops.debug;
+        gops->debugger = gv11b_ops.debugger;
         gops->dbg_session_ops = gv11b_ops.dbg_session_ops;
         gops->bus = gv11b_ops.bus;
 #if defined(CONFIG_GK20A_CYCLE_STATS)
diff --git a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c
index bfdd0788..861f6c00 100644
--- a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c
+++ b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c
@@ -39,6 +39,7 @@
 #include "gk20a/flcn_gk20a.h"
 #include "gk20a/mc_gk20a.h"
 #include "gk20a/fb_gk20a.h"
+#include "gk20a/dbg_gpu_gk20a.h"
 
 #include "gp10b/mc_gp10b.h"
 #include "gp10b/ltc_gp10b.h"
@@ -478,6 +479,9 @@ static const struct gpu_ops vgpu_gp10b_ops = {
         .debug = {
                 .show_dump = NULL,
         },
+        .debugger = {
+                .post_events = gk20a_dbg_gpu_post_events,
+        },
         .dbg_session_ops = {
                 .exec_reg_ops = vgpu_exec_regops,
                 .dbg_set_powergate = vgpu_dbg_set_powergate,
@@ -542,6 +546,7 @@ int vgpu_gp10b_init_hal(struct gk20a *g)
         gops->regops = vgpu_gp10b_ops.regops;
         gops->mc = vgpu_gp10b_ops.mc;
         gops->debug = vgpu_gp10b_ops.debug;
+        gops->debugger = vgpu_gp10b_ops.debugger;
         gops->dbg_session_ops = vgpu_gp10b_ops.dbg_session_ops;
         gops->bus = vgpu_gp10b_ops.bus;
 #if defined(CONFIG_GK20A_CYCLE_STATS)
diff --git a/drivers/gpu/nvgpu/vgpu/gr_vgpu.c b/drivers/gpu/nvgpu/vgpu/gr_vgpu.c
index ee5a5d36..d04beb56 100644
--- a/drivers/gpu/nvgpu/vgpu/gr_vgpu.c
+++ b/drivers/gpu/nvgpu/vgpu/gr_vgpu.c
@@ -951,7 +951,7 @@ int vgpu_gr_isr(struct gk20a *g, struct tegra_vgpu_gr_intr_info *info)
                                 NVGPU_ERR_NOTIFIER_GR_ERROR_SW_NOTIFY);
                 break;
         case TEGRA_VGPU_GR_INTR_SM_EXCEPTION:
-                gk20a_dbg_gpu_post_events(ch);
+                g->ops.debugger.post_events(ch);
                 break;
         default:
                 WARN_ON(1);
diff --git a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c b/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c
index b4e03ecd..01b31976 100644
--- a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c
+++ b/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c
@@ -39,6 +39,7 @@
 #include <gk20a/flcn_gk20a.h>
 #include <gk20a/bus_gk20a.h>
 #include <gk20a/mc_gk20a.h>
+#include "gk20a/dbg_gpu_gk20a.h"
 
 #include <gm20b/gr_gm20b.h>
 #include <gm20b/fb_gm20b.h>
@@ -525,6 +526,9 @@ static const struct gpu_ops vgpu_gv11b_ops = {
         .debug = {
                 .show_dump = NULL,
         },
+        .debugger = {
+                .post_events = gk20a_dbg_gpu_post_events,
+        },
         .dbg_session_ops = {
                 .exec_reg_ops = vgpu_exec_regops,
                 .dbg_set_powergate = vgpu_dbg_set_powergate,
@@ -585,6 +589,7 @@ int vgpu_gv11b_init_hal(struct gk20a *g)
         gops->regops = vgpu_gv11b_ops.regops;
         gops->mc = vgpu_gv11b_ops.mc;
         gops->debug = vgpu_gv11b_ops.debug;
+        gops->debugger = vgpu_gv11b_ops.debugger;
         gops->dbg_session_ops = vgpu_gv11b_ops.dbg_session_ops;
         gops->bus = vgpu_gv11b_ops.bus;
 #if defined(CONFIG_GK20A_CYCLE_STATS)