4 files changed, 26 insertions, 11 deletions

diff --git a/drivers/gpu/nvgpu/gp106/hal_gp106.c b/drivers/gpu/nvgpu/gp106/hal_gp106.c
index 5c9e012d..1dd16139 100644
--- a/drivers/gpu/nvgpu/gp106/hal_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/hal_gp106.c
@@ -24,7 +24,7 @@
 #include "gp10b/mc_gp10b.h"
 #include "gp10b/ltc_gp10b.h"
 #include "gp10b/mm_gp10b.h"
-#include "gp10b/ce2_gp10b.h"
+#include "gp10b/ce_gp10b.h"
 #include "gp10b/fb_gp10b.h"
 #include "gp10b/fifo_gp10b.h"
 #include "gp10b/gp10b_gating_reglist.h"
@@ -149,6 +149,9 @@ static int gp106_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;
@@ -189,7 +192,7 @@ int gp106_init_hal(struct gk20a *g)
         gp10b_init_ltc(gops);
         gp10b_init_fb(gops);
         gp10b_init_fifo(gops);
-        gp10b_init_ce2(gops);
+        gp10b_init_ce(gops);
         gp106_init_gr_ctx(gops);
         gp10b_init_mm(gops);
         gp106_init_pmu_ops(gops);
diff --git a/drivers/gpu/nvgpu/gp106/hw_ce2_gp106.h b/drivers/gpu/nvgpu/gp106/hw_ce_gp106.h
index d56b930b..36311136 100644
--- a/drivers/gpu/nvgpu/gp106/hw_ce2_gp106.h
+++ b/drivers/gpu/nvgpu/gp106/hw_ce_gp106.h
@@ -47,34 +47,34 @@
  *         comparison with unshifted values appropriate for use in field <y>
  *         of register <x>.
  */
-#ifndef _hw_ce2_gp106_h_
-#define _hw_ce2_gp106_h_
+#ifndef _hw_ce_gp106_h_
+#define _hw_ce_gp106_h_
 
-static inline u32 ce2_intr_status_r(u32 i)
+static inline u32 ce_intr_status_r(u32 i)
 {
         return 0x00104410 + i*128;
 }
-static inline u32 ce2_intr_status_blockpipe_pending_f(void)
+static inline u32 ce_intr_status_blockpipe_pending_f(void)
 {
         return 0x1;
 }
-static inline u32 ce2_intr_status_blockpipe_reset_f(void)
+static inline u32 ce_intr_status_blockpipe_reset_f(void)
 {
         return 0x1;
 }
-static inline u32 ce2_intr_status_nonblockpipe_pending_f(void)
+static inline u32 ce_intr_status_nonblockpipe_pending_f(void)
 {
         return 0x2;
 }
-static inline u32 ce2_intr_status_nonblockpipe_reset_f(void)
+static inline u32 ce_intr_status_nonblockpipe_reset_f(void)
 {
         return 0x2;
 }
-static inline u32 ce2_intr_status_launcherr_pending_f(void)
+static inline u32 ce_intr_status_launcherr_pending_f(void)
 {
         return 0x4;
 }
-static inline u32 ce2_intr_status_launcherr_reset_f(void)
+static inline u32 ce_intr_status_launcherr_reset_f(void)
 {
         return 0x4;
 }
diff --git a/drivers/gpu/nvgpu/gp106/hw_proj_gp106.h b/drivers/gpu/nvgpu/gp106/hw_proj_gp106.h
index 0b4b86b1..01e835ec 100644
--- a/drivers/gpu/nvgpu/gp106/hw_proj_gp106.h
+++ b/drivers/gpu/nvgpu/gp106/hw_proj_gp106.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 0x00000009;
+}
 static inline u32 proj_host_num_pbdma_v(void)
 {
         return 0x00000004;
diff --git a/drivers/gpu/nvgpu/gp106/hw_top_gp106.h b/drivers/gpu/nvgpu/gp106/hw_top_gp106.h
index bef6b804..e833c152 100644
--- a/drivers/gpu/nvgpu/gp106/hw_top_gp106.h
+++ b/drivers/gpu/nvgpu/gp106/hw_top_gp106.h
@@ -146,6 +146,14 @@ static inline u32 top_device_info_type_enum_copy0_f(void)
 {
         return 0x4;
 }
+static inline u32 top_device_info_type_enum_lce_v(void)
+{
+        return 0x00000013;
+}
+static inline u32 top_device_info_type_enum_lce_f(void)
+{
+        return 0x4c;
+}
 static inline u32 top_device_info_entry_v(u32 r)
 {
         return (r >> 0) & 0x3;