2 files changed, 12 insertions, 0 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h
index af40c969..9ab0d202 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.h
@@ -304,6 +304,9 @@ struct gpu_ops {
                 int (*handle_sm_exception)(struct gk20a *g, u32 gpc, u32 tpc,
                         bool *post_event, struct channel_gk20a *fault_ch,
                         u32 *hww_global_esr);
+                int (*handle_gcc_exception)(struct gk20a *g, u32 gpc, u32 tpc,
+                                bool *post_event, struct channel_gk20a *fault_ch,
+                                u32 *hww_global_esr);
                 int (*handle_tex_exception)(struct gk20a *g, u32 gpc, u32 tpc,
                                                 bool *post_event);
                 void (*enable_gpc_exceptions)(struct gk20a *g);
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
index 3486076e..4d41f9ff 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
@@ -6348,6 +6348,15 @@ static int gk20a_gr_handle_gpc_exception(struct gk20a *g, bool *post_event,
                          * exceptions to be cleared */
                         gk20a_gr_clear_sm_hww(g, gpc, tpc, global_esr);
                 }
+
+                /* Handle GCC exception */
+                if(gr_gpc0_gpccs_gpc_exception_gcc_v(gpc_exception) &&
+                                g->ops.gr.handle_gcc_exception) {
+                        int gcc_ret = 0;
+                        gcc_ret = g->ops.gr.handle_gcc_exception(g, gpc, tpc,
+                                post_event, fault_ch, hww_global_esr);
+                        ret = ret ? ret : gcc_ret;
+                }
         }
 
         return ret;