3 files changed, 15 insertions, 0 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
index b0fd3c0c..6a9e1753 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
@@ -5740,6 +5740,13 @@ int gk20a_gr_isr(struct gk20a *g)
                         need_reset |= -EFAULT;
                 }
 
+                if (exception & gr_exception_memfmt_m()) {
+                        u32 memfmt = gk20a_readl(g, gr_memfmt_hww_esr_r());
+                        gk20a_dbg(gpu_dbg_intr, "memfmt exception %08x\n",
+                                        memfmt);
+                        gk20a_writel(g, gr_memfmt_hww_esr_r(), memfmt);
+                }
+
                 /* check if a gpc exception has occurred */
                 if (exception & gr_exception_gpc_m() && need_reset == 0) {
                         struct channel_gk20a *fault_ch;
diff --git a/drivers/gpu/nvgpu/gk20a/hw_gr_gk20a.h b/drivers/gpu/nvgpu/gk20a/hw_gr_gk20a.h
index ff698a51..8fe75614 100644
--- a/drivers/gpu/nvgpu/gk20a/hw_gr_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/hw_gr_gk20a.h
@@ -178,6 +178,10 @@ static inline u32 gr_exception_gpc_m(void)
 {
         return 0x1 << 24;
 }
+static inline u32 gr_exception_memfmt_m(void)
+{
+        return 0x1 << 1;
+}
 static inline u32 gr_exception1_r(void)
 {
         return 0x00400118;
diff --git a/drivers/gpu/nvgpu/gm20b/hw_gr_gm20b.h b/drivers/gpu/nvgpu/gm20b/hw_gr_gm20b.h
index 543c7773..868b8fe7 100644
--- a/drivers/gpu/nvgpu/gm20b/hw_gr_gm20b.h
+++ b/drivers/gpu/nvgpu/gm20b/hw_gr_gm20b.h
@@ -166,6 +166,10 @@ static inline u32 gr_exception_gpc_m(void)
 {
         return 0x1 << 24;
 }
+static inline u32 gr_exception_memfmt_m(void)
+{
+        return 0x1 << 1;
+}
 static inline u32 gr_exception1_r(void)
 {
         return 0x00400118;