5 files changed, 36 insertions, 7 deletions

diff --git a/drivers/gpu/nvgpu/gm20b/fifo_gm20b.c b/drivers/gpu/nvgpu/gm20b/fifo_gm20b.c
index bb873bcc..031c5bae 100644
--- a/drivers/gpu/nvgpu/gm20b/fifo_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/fifo_gm20b.c
@@ -49,12 +49,14 @@ static void channel_gm20b_bind(struct channel_gk20a *c)
 static inline u32 gm20b_engine_id_to_mmu_id(struct gk20a *g, u32 engine_id)
 {
         u32 fault_id = ~0;
+        struct fifo_engine_info_gk20a *engine_info;
 
-        if (engine_id < ENGINE_INVAL_GK20A) {
-                struct fifo_engine_info_gk20a *info =
-                        &g->fifo.engine_info[engine_id];
+        engine_info = gk20a_fifo_get_engine_info(g, engine_id);
 
-                fault_id = info->fault_id;
+        if (engine_info) {
+                fault_id = engine_info->fault_id;
+        } else {
+                gk20a_err(g->dev, "engine_id is not in active list/invalid %d", engine_id);
         }
         return fault_id;
 }
@@ -72,7 +74,7 @@ static void gm20b_fifo_trigger_mmu_fault(struct gk20a *g,
         for_each_set_bit(engine_id, &engine_ids, 32) {
                 u32 engine_mmu_fault_id;
 
-                if (engine_id > g->fifo.max_engines) {
+                if (!gk20a_fifo_is_valid_engine_id(g, engine_id)) {
                         gk20a_err(dev_from_gk20a(g),
                                   "faulting unknown engine %ld", engine_id);
                 } else {
@@ -109,7 +111,7 @@ static u32 gm20b_fifo_get_num_fifos(struct gk20a *g)
         return ccsr_channel__size_1_v();
 }
 
-void gm20b_device_info_data_parse(struct gk20a *g,
+static void gm20b_device_info_data_parse(struct gk20a *g,
                                                 u32 table_entry, u32 *inst_id,
                                                 u32 *pri_base, u32 *fault_id)
 {
@@ -152,4 +154,5 @@ void gm20b_init_fifo(struct gpu_ops *gops)
         gops->fifo.force_reset_ch = gk20a_fifo_force_reset_ch;
         gops->fifo.engine_enum_from_type = gk20a_fifo_engine_enum_from_type;
         gops->fifo.device_info_data_parse = gm20b_device_info_data_parse;
+        gops->fifo.eng_runlist_base_size = fifo_eng_runlist_base__size_1_v;
 }
diff --git a/drivers/gpu/nvgpu/gm20b/gr_gm20b.c b/drivers/gpu/nvgpu/gm20b/gr_gm20b.c
index d5131b7a..cc709c78 100644
--- a/drivers/gpu/nvgpu/gm20b/gr_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/gr_gm20b.c
@@ -855,6 +855,9 @@ static int gr_gm20b_dump_gr_status_regs(struct gk20a *g,
                            struct gk20a_debug_output *o)
 {
         struct gr_gk20a *gr = &g->gr;
+        u32 gr_engine_id;
+
+        gr_engine_id = gk20a_fifo_get_gr_engine_id(g);
 
         gk20a_debug_output(o, "NV_PGRAPH_STATUS: 0x%x\n",
                 gk20a_readl(g, gr_status_r()));
@@ -875,7 +878,7 @@ static int gr_gm20b_dump_gr_status_regs(struct gk20a *g,
         gk20a_debug_output(o, "NV_PGRAPH_FECS_INTR  : 0x%x\n",
                 gk20a_readl(g, gr_fecs_intr_r()));
         gk20a_debug_output(o, "NV_PFIFO_ENGINE_STATUS(GR) : 0x%x\n",
-                gk20a_readl(g, fifo_engine_status_r(ENGINE_GR_GK20A)));
+                gk20a_readl(g, fifo_engine_status_r(gr_engine_id)));
         gk20a_debug_output(o, "NV_PGRAPH_ACTIVITY0: 0x%x\n",
                 gk20a_readl(g, gr_activity_0_r()));
         gk20a_debug_output(o, "NV_PGRAPH_ACTIVITY1: 0x%x\n",
diff --git a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
index c0113498..cbd3f50b 100644
--- a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
@@ -140,6 +140,9 @@ static int gm20b_get_litter_value(struct gk20a *g,
         case GPU_LIT_ROP_SHARED_BASE:
                 ret = proj_rop_shared_base_v();
                 break;
+        case GPU_LIT_HOST_NUM_ENGINES:
+                ret = proj_host_num_engines_v();
+                break;
         case GPU_LIT_HOST_NUM_PBDMA:
                 ret = proj_host_num_pbdma_v();
                 break;
diff --git a/drivers/gpu/nvgpu/gm20b/hw_proj_gm20b.h b/drivers/gpu/nvgpu/gm20b/hw_proj_gm20b.h
index b837918c..d4d412e1 100644
--- a/drivers/gpu/nvgpu/gm20b/hw_proj_gm20b.h
+++ b/drivers/gpu/nvgpu/gm20b/hw_proj_gm20b.h
@@ -106,6 +106,10 @@ static inline u32 proj_tpc_in_gpc_shared_base_v(void)
 {
         return 0x00001800;
 }
+static inline u32 proj_host_num_engines_v(void)
+{
+        return 0x00000002;
+}
 static inline u32 proj_host_num_pbdma_v(void)
 {
         return 0x00000001;
diff --git a/drivers/gpu/nvgpu/gm20b/hw_top_gm20b.h b/drivers/gpu/nvgpu/gm20b/hw_top_gm20b.h
index c70f388c..cca37294 100644
--- a/drivers/gpu/nvgpu/gm20b/hw_top_gm20b.h
+++ b/drivers/gpu/nvgpu/gm20b/hw_top_gm20b.h
@@ -138,6 +138,22 @@ static inline u32 top_device_info_type_enum_graphics_f(void)
 {
         return 0x0;
 }
+static inline u32 top_device_info_type_enum_copy0_v(void)
+{
+        return 0x00000001;
+}
+static inline u32 top_device_info_type_enum_copy0_f(void)
+{
+        return 0x4;
+}
+static inline u32 top_device_info_type_enum_copy1_v(void)
+{
+        return 0x00000002;
+}
+static inline u32 top_device_info_type_enum_copy1_f(void)
+{
+        return 0x8;
+}
 static inline u32 top_device_info_type_enum_copy2_v(void)
 {
         return 0x00000003;