2 files changed, 25 insertions, 0 deletions

diff --git a/drivers/gpu/nvgpu/include/nvgpu/vgpu/tegra_vgpu.h b/drivers/gpu/nvgpu/include/nvgpu/vgpu/tegra_vgpu.h
index 43a6d079..ba7d2ba2 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/vgpu/tegra_vgpu.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/vgpu/tegra_vgpu.h
@@ -714,6 +714,11 @@ struct tegra_vgpu_channel_cleanup {
         u32 chid;
 };
 
+struct tegra_vgpu_channel_set_error_notifier {
+        u32 chid;
+        u32 error;
+};
+
 enum {
 
         TEGRA_VGPU_INTR_GR = 0,
@@ -732,6 +737,7 @@ enum {
         TEGRA_VGPU_EVENT_SM_ESR = 4,
         TEGRA_VGPU_EVENT_SEMAPHORE_WAKEUP = 5,
         TEGRA_VGPU_EVENT_CHANNEL_CLEANUP = 6,
+        TEGRA_VGPU_EVENT_SET_ERROR_NOTIFIER = 7,
 };
 
 struct tegra_vgpu_intr_msg {
@@ -748,6 +754,7 @@ struct tegra_vgpu_intr_msg {
                 struct tegra_vgpu_sm_esr_info sm_esr;
                 struct tegra_vgpu_semaphore_wakeup sem_wakeup;
                 struct tegra_vgpu_channel_cleanup ch_cleanup;
+                struct tegra_vgpu_channel_set_error_notifier set_error_notifier;
                 char padding[32];
         } info;
 };
diff --git a/drivers/gpu/nvgpu/vgpu/vgpu.c b/drivers/gpu/nvgpu/vgpu/vgpu.c
index 08556ee5..1e77cda9 100644
--- a/drivers/gpu/nvgpu/vgpu/vgpu.c
+++ b/drivers/gpu/nvgpu/vgpu/vgpu.c
@@ -122,6 +122,20 @@ static void vgpu_channel_abort_cleanup(struct gk20a *g, u32 chid)
         g->ops.fifo.ch_abort_clean_up(ch);
 }
 
+static void vgpu_set_error_notifier(struct gk20a *g,
+                struct tegra_vgpu_channel_set_error_notifier *p)
+{
+        struct channel_gk20a *ch;
+
+        if (p->chid >= g->fifo.num_channels) {
+                nvgpu_err(g, "invalid chid %d", p->chid);
+                return;
+        }
+
+        ch = &g->fifo.channel[p->chid];
+        g->ops.fifo.set_error_notifier(ch, p->error);
+}
+
 int vgpu_intr_thread(void *dev_id)
 {
         struct gk20a *g = dev_id;
@@ -181,6 +195,10 @@ int vgpu_intr_thread(void *dev_id)
                         vgpu_channel_abort_cleanup(g,
                                         msg->info.ch_cleanup.chid);
                         break;
+                case TEGRA_VGPU_EVENT_SET_ERROR_NOTIFIER:
+                        vgpu_set_error_notifier(g,
+                                                &msg->info.set_error_notifier);
+                        break;
                 default:
                         nvgpu_err(g, "unknown event %u", msg->event);
                         break;