4 files changed, 16 insertions, 10 deletions

diff --git a/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c b/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c
index 6406c0da..c8a8ce49 100644
--- a/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c
+++ b/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c
@@ -643,7 +643,8 @@ int vgpu_fifo_force_reset_ch(struct channel_gk20a *ch,
                 nvgpu_list_for_each_entry(ch_tsg, &tsg->ch_list,
                                 channel_gk20a, ch_entry) {
                         if (gk20a_channel_get(ch_tsg)) {
-                                nvgpu_set_error_notifier(ch_tsg, err_code);
+                                g->ops.fifo.set_error_notifier(ch_tsg,
+                                                                err_code);
                                 ch_tsg->has_timedout = true;
                                 gk20a_channel_put(ch_tsg);
                         }
@@ -651,7 +652,7 @@ int vgpu_fifo_force_reset_ch(struct channel_gk20a *ch,
 
                 nvgpu_rwsem_up_read(&tsg->ch_list_lock);
         } else {
-                nvgpu_set_error_notifier(ch, err_code);
+                g->ops.fifo.set_error_notifier(ch, err_code);
                 ch->has_timedout = true;
         }
 
@@ -726,10 +727,11 @@ int vgpu_fifo_isr(struct gk20a *g, struct tegra_vgpu_fifo_intr_info *info)
 
         switch (info->type) {
         case TEGRA_VGPU_FIFO_INTR_PBDMA:
-                nvgpu_set_error_notifier(ch, NVGPU_ERR_NOTIFIER_PBDMA_ERROR);
+                g->ops.fifo.set_error_notifier(ch,
+                                                NVGPU_ERR_NOTIFIER_PBDMA_ERROR);
                 break;
         case TEGRA_VGPU_FIFO_INTR_CTXSW_TIMEOUT:
-                nvgpu_set_error_notifier(ch,
+                g->ops.fifo.set_error_notifier(ch,
                                         NVGPU_ERR_NOTIFIER_FIFO_ERROR_IDLE_TIMEOUT);
                 break;
         case TEGRA_VGPU_FIFO_INTR_MMU_FAULT:
diff --git a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c
index ab08e09d..8b9f04dd 100644
--- a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c
+++ b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c
@@ -65,6 +65,7 @@
 
 #include <nvgpu/enabled.h>
 #include <nvgpu/vgpu/vgpu.h>
+#include <nvgpu/error_notifier.h>
 
 #include <nvgpu/hw/gp10b/hw_fuse_gp10b.h>
 #include <nvgpu/hw/gp10b/hw_fifo_gp10b.h>
@@ -349,6 +350,7 @@ static const struct gpu_ops vgpu_gp10b_ops = {
                 .check_ch_ctxsw_timeout = gk20a_fifo_check_ch_ctxsw_timeout,
                 .channel_suspend = gk20a_channel_suspend,
                 .channel_resume = gk20a_channel_resume,
+                .set_error_notifier = nvgpu_set_error_notifier,
 #ifdef CONFIG_TEGRA_GK20A_NVHOST
                 .alloc_syncpt_buf = gk20a_fifo_alloc_syncpt_buf,
                 .free_syncpt_buf = gk20a_fifo_free_syncpt_buf,
diff --git a/drivers/gpu/nvgpu/vgpu/gr_vgpu.c b/drivers/gpu/nvgpu/vgpu/gr_vgpu.c
index 1c72ca76..a6cb3828 100644
--- a/drivers/gpu/nvgpu/vgpu/gr_vgpu.c
+++ b/drivers/gpu/nvgpu/vgpu/gr_vgpu.c
@@ -926,30 +926,30 @@ int vgpu_gr_isr(struct gk20a *g, struct tegra_vgpu_gr_intr_info *info)
                 nvgpu_cond_broadcast_interruptible(&ch->semaphore_wq);
                 break;
         case TEGRA_VGPU_GR_INTR_SEMAPHORE_TIMEOUT:
-                nvgpu_set_error_notifier(ch,
+                g->ops.fifo.set_error_notifier(ch,
                                 NVGPU_ERR_NOTIFIER_GR_SEMAPHORE_TIMEOUT);
                 break;
         case TEGRA_VGPU_GR_INTR_ILLEGAL_NOTIFY:
-                nvgpu_set_error_notifier(ch,
+                g->ops.fifo.set_error_notifier(ch,
                                         NVGPU_ERR_NOTIFIER_GR_ILLEGAL_NOTIFY);
         case TEGRA_VGPU_GR_INTR_ILLEGAL_METHOD:
                 break;
         case TEGRA_VGPU_GR_INTR_ILLEGAL_CLASS:
-                nvgpu_set_error_notifier(ch,
+                g->ops.fifo.set_error_notifier(ch,
                                         NVGPU_ERR_NOTIFIER_GR_ERROR_SW_NOTIFY);
                 break;
         case TEGRA_VGPU_GR_INTR_FECS_ERROR:
                 break;
         case TEGRA_VGPU_GR_INTR_CLASS_ERROR:
-                nvgpu_set_error_notifier(ch,
+                g->ops.fifo.set_error_notifier(ch,
                                         NVGPU_ERR_NOTIFIER_GR_ERROR_SW_NOTIFY);
                 break;
         case TEGRA_VGPU_GR_INTR_FIRMWARE_METHOD:
-                nvgpu_set_error_notifier(ch,
+                g->ops.fifo.set_error_notifier(ch,
                                 NVGPU_ERR_NOTIFIER_GR_ERROR_SW_NOTIFY);
                 break;
         case TEGRA_VGPU_GR_INTR_EXCEPTION:
-                nvgpu_set_error_notifier(ch,
+                g->ops.fifo.set_error_notifier(ch,
                                 NVGPU_ERR_NOTIFIER_GR_ERROR_SW_NOTIFY);
                 break;
         case TEGRA_VGPU_GR_INTR_SM_EXCEPTION:
diff --git a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c b/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c
index 5e3af9d7..32edbd21 100644
--- a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c
+++ b/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c
@@ -23,6 +23,7 @@
 #include <gk20a/gk20a.h>
 #include <gv11b/hal_gv11b.h>
 #include <nvgpu/vgpu/vgpu.h>
+#include <nvgpu/error_notifier.h>
 
 #include "vgpu/fifo_vgpu.h"
 #include "vgpu/gr_vgpu.h"
@@ -392,6 +393,7 @@ static const struct gpu_ops vgpu_gv11b_ops = {
                 .check_ch_ctxsw_timeout = gk20a_fifo_check_ch_ctxsw_timeout,
                 .channel_suspend = gk20a_channel_suspend,
                 .channel_resume = gk20a_channel_resume,
+                .set_error_notifier = nvgpu_set_error_notifier,
 #ifdef CONFIG_TEGRA_GK20A_NVHOST
                 .alloc_syncpt_buf = vgpu_gv11b_fifo_alloc_syncpt_buf,
                 .free_syncpt_buf = gv11b_fifo_free_syncpt_buf,