Revert "gpu: nvgpu: add hal op for gr set error notifier"

This reverts commit d6c6c6c483478654b34685b9e13ed160bad49a1c.

RM server has moved to gops.fifo.set_error_notifier.
gops.gr.set_error_notifier is not needed anymore.

Jira VQRM-3058

Change-Id: I0fe7f914778ce66701a699aece2b36a5cd8079da
Signed-off-by: Richard Zhao <rizhao@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1679708
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

8 files changed, 9 insertions, 18 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h
index c55ba146..2e7bd4a5 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.h
@@ -446,8 +446,6 @@ struct gpu_ops {
                                          struct nvgpu_gr_ctx *gr_ctx);
                 void (*fecs_host_int_enable)(struct gk20a *g);
                 int (*handle_ssync_hww)(struct gk20a *g);
-                void (*set_error_notifier)(struct gk20a *g,
-                        struct gr_gk20a_isr_data *isr_data, u32 error_notifier);
                 int (*handle_notify_pending)(struct gk20a *g,
                                         struct gr_gk20a_isr_data *isr_data);
                 int (*handle_semaphore_pending)(struct gk20a *g,
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
index 121f264a..ed1f9af9 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
@@ -5136,7 +5136,7 @@ int gk20a_gr_reset(struct gk20a *g)
         return err;
 }
 
-void gk20a_gr_set_error_notifier(struct gk20a *g,
+static void gk20a_gr_set_error_notifier(struct gk20a *g,
                   struct gr_gk20a_isr_data *isr_data, u32 error_notifier)
 {
         struct fifo_gk20a *f = &g->fifo;
@@ -5169,7 +5169,7 @@ static int gk20a_gr_handle_semaphore_timeout_pending(struct gk20a *g,
                   struct gr_gk20a_isr_data *isr_data)
 {
         gk20a_dbg_fn("");
-        g->ops.gr.set_error_notifier(g, isr_data,
+        gk20a_gr_set_error_notifier(g, isr_data,
                          NVGPU_ERR_NOTIFIER_GR_SEMAPHORE_TIMEOUT);
         nvgpu_err(g,
                    "gr semaphore timeout");
@@ -5180,7 +5180,7 @@ static int gk20a_gr_intr_illegal_notify_pending(struct gk20a *g,
                   struct gr_gk20a_isr_data *isr_data)
 {
         gk20a_dbg_fn("");
-        g->ops.gr.set_error_notifier(g, isr_data,
+        gk20a_gr_set_error_notifier(g, isr_data,
                          NVGPU_ERR_NOTIFIER_GR_ILLEGAL_NOTIFY);
         /* This is an unrecoverable error, reset is needed */
         nvgpu_err(g,
@@ -5195,7 +5195,7 @@ static int gk20a_gr_handle_illegal_method(struct gk20a *g,
                         isr_data->class_num, isr_data->offset,
                         isr_data->data_lo);
         if (ret) {
-                g->ops.gr.set_error_notifier(g, isr_data,
+                gk20a_gr_set_error_notifier(g, isr_data,
                          NVGPU_ERR_NOTIFIER_GR_ILLEGAL_NOTIFY);
                 nvgpu_err(g, "invalid method class 0x%08x"
                         ", offset 0x%08x address 0x%08x",
@@ -5208,7 +5208,7 @@ static int gk20a_gr_handle_illegal_class(struct gk20a *g,
                                           struct gr_gk20a_isr_data *isr_data)
 {
         gk20a_dbg_fn("");
-        g->ops.gr.set_error_notifier(g, isr_data,
+        gk20a_gr_set_error_notifier(g, isr_data,
                          NVGPU_ERR_NOTIFIER_GR_ERROR_SW_NOTIFY);
         nvgpu_err(g,
                    "invalid class 0x%08x, offset 0x%08x",
@@ -5226,7 +5226,7 @@ int gk20a_gr_handle_fecs_error(struct gk20a *g, struct channel_gk20a *ch,
                 return 0;
 
         if (gr_fecs_intr & gr_fecs_host_int_status_umimp_firmware_method_f(1)) {
-                g->ops.gr.set_error_notifier(g, isr_data,
+                gk20a_gr_set_error_notifier(g, isr_data,
                          NVGPU_ERR_NOTIFIER_FECS_ERR_UNIMP_FIRMWARE_METHOD);
                 nvgpu_err(g,
                           "firmware method error 0x%08x for offset 0x%04x",
@@ -5252,7 +5252,7 @@ static int gk20a_gr_handle_class_error(struct gk20a *g,
 
         gr_class_error =
                 gr_class_error_code_v(gk20a_readl(g, gr_class_error_r()));
-        g->ops.gr.set_error_notifier(g, isr_data,
+        gk20a_gr_set_error_notifier(g, isr_data,
                          NVGPU_ERR_NOTIFIER_GR_ERROR_SW_NOTIFY);
         nvgpu_err(g, "class error 0x%08x, offset 0x%08x,"
                 "sub channel 0x%08x mme generated %d,"
@@ -5281,7 +5281,7 @@ static int gk20a_gr_handle_firmware_method(struct gk20a *g,
 {
         gk20a_dbg_fn("");
 
-        g->ops.gr.set_error_notifier(g, isr_data,
+        gk20a_gr_set_error_notifier(g, isr_data,
                          NVGPU_ERR_NOTIFIER_GR_ERROR_SW_NOTIFY);
         nvgpu_err(g,
                    "firmware method 0x%08x, offset 0x%08x for channel %u",
@@ -6085,7 +6085,7 @@ int gk20a_gr_isr(struct gk20a *g)
 
                 if (need_reset) {
                         nvgpu_err(g, "set gr exception notifier");
-                        g->ops.gr.set_error_notifier(g, &isr_data,
+                        gk20a_gr_set_error_notifier(g, &isr_data,
                                          NVGPU_ERR_NOTIFIER_GR_EXCEPTION);
                 }
         }
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.h b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
index 02f5e534..79afbf0c 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
@@ -799,8 +799,6 @@ void gk20a_gr_get_ovr_perf_regs(struct gk20a *g, u32 *num_ovr_perf_regs,
 void gk20a_gr_init_ctxsw_hdr_data(struct gk20a *g,
                                         struct nvgpu_mem *mem);
 u32 gr_gk20a_get_patch_slots(struct gk20a *g);
-void gk20a_gr_set_error_notifier(struct gk20a *g,
-                        struct gr_gk20a_isr_data *isr_data, u32 error_notifier);
 int gk20a_gr_handle_notify_pending(struct gk20a *g,
                                 struct gr_gk20a_isr_data *isr_data);
 int gr_gk20a_commit_global_ctx_buffers(struct gk20a *g,
diff --git a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
index d6f64bb1..0e236d43 100644
--- a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
@@ -315,7 +315,6 @@ static const struct gpu_ops gm20b_ops = {
                 .disable_rd_coalesce = gm20a_gr_disable_rd_coalesce,
                 .init_ctxsw_hdr_data = gk20a_gr_init_ctxsw_hdr_data,
                 .fecs_host_int_enable = gr_gk20a_fecs_host_int_enable,
-                .set_error_notifier = gk20a_gr_set_error_notifier,
                 .handle_notify_pending = gk20a_gr_handle_notify_pending,
                 .handle_semaphore_pending = gk20a_gr_handle_semaphore_pending,
                 .add_ctxsw_reg_pm_fbpa = gr_gk20a_add_ctxsw_reg_pm_fbpa,
diff --git a/drivers/gpu/nvgpu/gp106/hal_gp106.c b/drivers/gpu/nvgpu/gp106/hal_gp106.c
index eecb0f09..aedd6d14 100644
--- a/drivers/gpu/nvgpu/gp106/hal_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/hal_gp106.c
@@ -378,7 +378,6 @@ static const struct gpu_ops gp106_ops = {
                 .set_ctxsw_preemption_mode = gr_gp106_set_ctxsw_preemption_mode,
                 .load_ctxsw_ucode = gr_gm20b_load_ctxsw_ucode,
                 .fecs_host_int_enable = gr_gk20a_fecs_host_int_enable,
-                .set_error_notifier = gk20a_gr_set_error_notifier,
                 .handle_notify_pending = gk20a_gr_handle_notify_pending,
                 .handle_semaphore_pending = gk20a_gr_handle_semaphore_pending,
                 .add_ctxsw_reg_pm_fbpa = gr_gk20a_add_ctxsw_reg_pm_fbpa,
diff --git a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c
index d70d6ac0..30e04717 100644
--- a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c
@@ -346,7 +346,6 @@ static const struct gpu_ops gp10b_ops = {
                                 gr_gp10b_get_max_gfxp_wfi_timeout_count,
                 .dump_ctxsw_stats = gr_gp10b_dump_ctxsw_stats,
                 .fecs_host_int_enable = gr_gk20a_fecs_host_int_enable,
-                .set_error_notifier = gk20a_gr_set_error_notifier,
                 .handle_notify_pending = gk20a_gr_handle_notify_pending,
                 .handle_semaphore_pending = gk20a_gr_handle_semaphore_pending,
                 .add_ctxsw_reg_pm_fbpa = gr_gk20a_add_ctxsw_reg_pm_fbpa,
diff --git a/drivers/gpu/nvgpu/gv100/hal_gv100.c b/drivers/gpu/nvgpu/gv100/hal_gv100.c
index fc303e70..bf687dbf 100644
--- a/drivers/gpu/nvgpu/gv100/hal_gv100.c
+++ b/drivers/gpu/nvgpu/gv100/hal_gv100.c
@@ -425,7 +425,6 @@ static const struct gpu_ops gv100_ops = {
                 .decode_egpc_addr = gv11b_gr_decode_egpc_addr,
                 .fecs_host_int_enable = gr_gv11b_fecs_host_int_enable,
                 .handle_ssync_hww = gr_gv11b_handle_ssync_hww,
-                .set_error_notifier = gk20a_gr_set_error_notifier,
                 .handle_notify_pending = gk20a_gr_handle_notify_pending,
                 .handle_semaphore_pending = gk20a_gr_handle_semaphore_pending,
                 .add_ctxsw_reg_pm_fbpa = gr_gv100_add_ctxsw_reg_pm_fbpa,
diff --git a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c
index 49e83c4c..6aef49d7 100644
--- a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c
@@ -398,7 +398,6 @@ static const struct gpu_ops gv11b_ops = {
                 .dump_ctxsw_stats = gr_gp10b_dump_ctxsw_stats,
                 .fecs_host_int_enable = gr_gv11b_fecs_host_int_enable,
                 .handle_ssync_hww = gr_gv11b_handle_ssync_hww,
-                .set_error_notifier = gk20a_gr_set_error_notifier,
                 .handle_notify_pending = gk20a_gr_handle_notify_pending,
                 .handle_semaphore_pending = gk20a_gr_handle_semaphore_pending,
                 .add_ctxsw_reg_pm_fbpa = gr_gk20a_add_ctxsw_reg_pm_fbpa,