2 files changed, 31 insertions, 28 deletions

diff --git a/drivers/gpu/nvgpu/vgpu/vgpu.c b/drivers/gpu/nvgpu/vgpu/vgpu.c
index 213f6bbb..da79de9d 100644
--- a/drivers/gpu/nvgpu/vgpu/vgpu.c
+++ b/drivers/gpu/nvgpu/vgpu/vgpu.c
@@ -1,7 +1,7 @@
 /*
  * Virtualized GPU
  *
- * Copyright (c) 2014-2016, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2014-2017, NVIDIA CORPORATION.  All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -102,12 +102,12 @@ int vgpu_get_attribute(u64 handle, u32 attrib, u32 *value)
         return 0;
 }
 
-static void vgpu_handle_general_event(struct gk20a *g,
-                        struct tegra_vgpu_general_event_info *info)
+static void vgpu_handle_channel_event(struct gk20a *g,
+                        struct tegra_vgpu_channel_event_info *info)
 {
         if (info->id >= g->fifo.num_channels ||
                 info->event_id >= NVGPU_IOCTL_CHANNEL_EVENT_ID_MAX) {
-                gk20a_err(g->dev, "invalid general event");
+                gk20a_err(g->dev, "invalid channel event");
                 return;
         }
 
@@ -152,30 +152,33 @@ static int vgpu_intr_thread(void *dev_id)
                         break;
                 }
 
-                if (msg->event == TEGRA_VGPU_EVENT_FECS_TRACE) {
+                switch (msg->event) {
+                case TEGRA_VGPU_EVENT_INTR:
+                        if (msg->unit == TEGRA_VGPU_INTR_GR)
+                                vgpu_gr_isr(g, &msg->info.gr_intr);
+                        else if (msg->unit == TEGRA_VGPU_NONSTALL_INTR_GR)
+                                vgpu_gr_nonstall_isr(g,
+                                        &msg->info.gr_nonstall_intr);
+                        else if (msg->unit == TEGRA_VGPU_INTR_FIFO)
+                                vgpu_fifo_isr(g, &msg->info.fifo_intr);
+                        else if (msg->unit == TEGRA_VGPU_NONSTALL_INTR_FIFO)
+                                vgpu_fifo_nonstall_isr(g,
+                                                &msg->info.fifo_nonstall_intr);
+                        else if (msg->unit == TEGRA_VGPU_NONSTALL_INTR_CE2)
+                                vgpu_ce2_nonstall_isr(g,
+                                        &msg->info.ce2_nonstall_intr);
+                        break;
+                case TEGRA_VGPU_EVENT_FECS_TRACE:
                         vgpu_fecs_trace_data_update(g);
-                        tegra_gr_comm_release(handle);
-                        continue;
-                }
-
-                if (msg->event == TEGRA_VGPU_EVENT_CHANNEL) {
-                        vgpu_handle_general_event(g, &msg->info.general_event);
-                        tegra_gr_comm_release(handle);
-                        continue;
+                        break;
+                case TEGRA_VGPU_EVENT_CHANNEL:
+                        vgpu_handle_channel_event(g, &msg->info.channel_event);
+                        break;
+                default:
+                        gk20a_err(g->dev, "unknown event %u", msg->event);
+                        break;
                 }
 
-                if (msg->unit == TEGRA_VGPU_INTR_GR)
-                        vgpu_gr_isr(g, &msg->info.gr_intr);
-                else if (msg->unit == TEGRA_VGPU_NONSTALL_INTR_GR)
-                        vgpu_gr_nonstall_isr(g, &msg->info.gr_nonstall_intr);
-                else if (msg->unit == TEGRA_VGPU_INTR_FIFO)
-                        vgpu_fifo_isr(g, &msg->info.fifo_intr);
-                else if (msg->unit == TEGRA_VGPU_NONSTALL_INTR_FIFO)
-                        vgpu_fifo_nonstall_isr(g,
-                                        &msg->info.fifo_nonstall_intr);
-                else if (msg->unit == TEGRA_VGPU_NONSTALL_INTR_CE2)
-                        vgpu_ce2_nonstall_isr(g, &msg->info.ce2_nonstall_intr);
-
                 tegra_gr_comm_release(handle);
         }
 
diff --git a/include/linux/tegra_vgpu.h b/include/linux/tegra_vgpu.h
index 79698d23..40f92aec 100644
--- a/include/linux/tegra_vgpu.h
+++ b/include/linux/tegra_vgpu.h
@@ -1,7 +1,7 @@
 /*
  * Tegra GPU Virtualization Interfaces to Server
  *
- * Copyright (c) 2014-2016, NVIDIA Corporation. All rights reserved.
+ * Copyright (c) 2014-2017, NVIDIA Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -554,7 +554,7 @@ struct tegra_vgpu_fecs_trace_event_info {
         u32 type;
 };
 
-struct tegra_vgpu_general_event_info {
+struct tegra_vgpu_channel_event_info {
         u32 event_id;
         u32 is_tsg;
         u32 id; /* channel id or tsg id */
@@ -587,7 +587,7 @@ struct tegra_vgpu_intr_msg {
                 struct tegra_vgpu_fifo_nonstall_intr_info fifo_nonstall_intr;
                 struct tegra_vgpu_ce2_nonstall_intr_info ce2_nonstall_intr;
                 struct tegra_vgpu_fecs_trace_event_info fecs_trace;
-                struct tegra_vgpu_general_event_info general_event;
+                struct tegra_vgpu_channel_event_info channel_event;
                 char padding[32];
         } info;
 };