8 files changed, 60 insertions, 78 deletions

diff --git a/drivers/gpu/nvgpu/common/linux/debug.c b/drivers/gpu/nvgpu/common/linux/debug.c
index 7a4e4e9f..fb07df5b 100644
--- a/drivers/gpu/nvgpu/common/linux/debug.c
+++ b/drivers/gpu/nvgpu/common/linux/debug.c
@@ -364,23 +364,20 @@ void gk20a_debug_init(struct gk20a *g, const char *debugfs_symlink)
                                         S_IRUGO|S_IWUSR,
                                         l->debugfs,
                                         &g->runlist_interleave);
-#ifdef CONFIG_ARCH_TEGRA_18x_SOC
         l->debugfs_force_preemption_gfxp =
                 debugfs_create_bool("force_preemption_gfxp", S_IRUGO|S_IWUSR,
                 l->debugfs,
-                &g->gr.t18x.ctx_vars.force_preemption_gfxp);
+                &g->gr.ctx_vars.force_preemption_gfxp);
 
         l->debugfs_force_preemption_cilp =
                 debugfs_create_bool("force_preemption_cilp", S_IRUGO|S_IWUSR,
                 l->debugfs,
-                &g->gr.t18x.ctx_vars.force_preemption_cilp);
+                &g->gr.ctx_vars.force_preemption_cilp);
 
         l->debugfs_dump_ctxsw_stats =
                 debugfs_create_bool("dump_ctxsw_stats_on_channel_close",
                         S_IRUGO|S_IWUSR, l->debugfs,
-                        &g->gr.t18x.
-                                ctx_vars.dump_ctxsw_stats_on_channel_close);
-#endif
+                        &g->gr.ctx_vars.dump_ctxsw_stats_on_channel_close);
 
         gr_gk20a_debugfs_init(g);
         gk20a_pmu_debugfs_init(g);
diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_channel.c b/drivers/gpu/nvgpu/common/linux/ioctl_channel.c
index 31651795..0ac50140 100644
--- a/drivers/gpu/nvgpu/common/linux/ioctl_channel.c
+++ b/drivers/gpu/nvgpu/common/linux/ioctl_channel.c
@@ -22,7 +22,6 @@
 #include <linux/dma-buf.h>
 #include <linux/poll.h>
 #include <uapi/linux/nvgpu.h>
-#include <uapi/linux/nvgpu-t18x.h>
 
 #include <nvgpu/semaphore.h>
 #include <nvgpu/timers.h>
diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c b/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c
index 2a91b87d..c28bdfdb 100644
--- a/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c
+++ b/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c
@@ -20,7 +20,6 @@
 #include <linux/anon_inodes.h>
 #include <linux/fs.h>
 #include <uapi/linux/nvgpu.h>
-#include <uapi/linux/nvgpu-t18x.h>
 
 #include <nvgpu/bitops.h>
 #include <nvgpu/kmem.h>
@@ -54,9 +53,7 @@
 struct gk20a_ctrl_priv {
         struct device *dev;
         struct gk20a *g;
-#ifdef CONFIG_ARCH_TEGRA_18x_SOC
         struct nvgpu_clk_session *clk_session;
-#endif
 };
 
 int gk20a_ctrl_dev_open(struct inode *inode, struct file *filp)
@@ -95,9 +92,7 @@ int gk20a_ctrl_dev_open(struct inode *inode, struct file *filp)
                 gk20a_idle(g);
         }
 
-#ifdef CONFIG_ARCH_TEGRA_18x_SOC
         err = nvgpu_clk_arb_init_session(g, &priv->clk_session);
-#endif
 free_ref:
         if (err)
                 gk20a_put(g);
@@ -110,10 +105,8 @@ int gk20a_ctrl_dev_release(struct inode *inode, struct file *filp)
 
         gk20a_dbg_fn("");
 
-#ifdef CONFIG_ARCH_TEGRA_18x_SOC
         if (priv->clk_session)
                 nvgpu_clk_arb_release_session(g, priv->clk_session);
-#endif
 
         gk20a_put(g);
         nvgpu_kfree(g, priv);
@@ -944,7 +937,6 @@ static int nvgpu_gpu_get_memory_state(struct gk20a *g,
         return err;
 }
 
-#ifdef CONFIG_ARCH_TEGRA_18x_SOC
 static int nvgpu_gpu_clk_get_vf_points(struct gk20a *g,
                 struct gk20a_ctrl_priv *priv,
                 struct nvgpu_gpu_clk_vf_points_args *args)
@@ -1402,7 +1394,6 @@ static int nvgpu_gpu_get_temperature(struct gk20a *g,
 
         return err;
 }
-#endif
 
 static int nvgpu_gpu_set_therm_alert_limit(struct gk20a *g,
                 struct nvgpu_gpu_set_therm_alert_limit_args *args)
@@ -1798,7 +1789,6 @@ long gk20a_ctrl_dev_ioctl(struct file *filp, unsigned int cmd, unsigned long arg
                         (struct nvgpu_gpu_get_memory_state_args *)buf);
                 break;
 
-#ifdef CONFIG_ARCH_TEGRA_18x_SOC
         case NVGPU_GPU_IOCTL_CLK_GET_RANGE:
                 err = nvgpu_gpu_clk_get_range(g, priv,
                         (struct nvgpu_gpu_clk_range_args *)buf);
@@ -1843,7 +1833,6 @@ long gk20a_ctrl_dev_ioctl(struct file *filp, unsigned int cmd, unsigned long arg
                 err = nvgpu_gpu_get_temperature(g,
                         (struct nvgpu_gpu_get_temperature_args *)buf);
                 break;
-#endif
 
         case NVGPU_GPU_IOCTL_SET_THERM_ALERT_LIMIT:
                 err = nvgpu_gpu_set_therm_alert_limit(g,
diff --git a/drivers/gpu/nvgpu/common/linux/module.c b/drivers/gpu/nvgpu/common/linux/module.c
index 76b9d4db..796507a9 100644
--- a/drivers/gpu/nvgpu/common/linux/module.c
+++ b/drivers/gpu/nvgpu/common/linux/module.c
@@ -339,10 +339,8 @@ static struct of_device_id tegra_gk20a_of_match[] = {
 #ifdef CONFIG_TEGRA_GK20A
         { .compatible = "nvidia,tegra210-gm20b",
                 .data = &gm20b_tegra_platform },
-#ifdef CONFIG_ARCH_TEGRA_18x_SOC
         { .compatible = "nvidia,tegra186-gp10b",
                 .data = &gp10b_tegra_platform },
-#endif
 #ifdef CONFIG_TEGRA_19x_GPU
         { .compatible = TEGRA_19x_GPU_COMPAT_TEGRA,
                 .data = &t19x_gpu_tegra_platform },
@@ -1035,11 +1033,9 @@ static int nvgpu_read_fuse_overrides(struct gk20a *g)
                 case GM20B_FUSE_OPT_TPC_DISABLE:
                         g->tpc_fs_mask_user = ~value;
                         break;
-#ifdef CONFIG_ARCH_TEGRA_18x_SOC
                 case GP10B_FUSE_OPT_ECC_EN:
-                        g->gr.t18x.fecs_feature_override_ecc_val = value;
+                        g->gr.fecs_feature_override_ecc_val = value;
                         break;
-#endif
                 default:
                         nvgpu_err(g, "ignore unknown fuse override %08x", fuse);
                         break;
@@ -1184,9 +1180,7 @@ int nvgpu_remove(struct device *dev, struct class *class)
         if (IS_ENABLED(CONFIG_GK20A_DEVFREQ))
                 gk20a_scale_exit(dev);
 
-#ifdef CONFIG_ARCH_TEGRA_18x_SOC
         nvgpu_clk_arb_cleanup_arbiter(g);
-#endif
 
         gk20a_user_deinit(dev, class);
 
diff --git a/drivers/gpu/nvgpu/common/linux/platform_gp10b_tegra.c b/drivers/gpu/nvgpu/common/linux/platform_gp10b_tegra.c
index b944844e..b42c3698 100644
--- a/drivers/gpu/nvgpu/common/linux/platform_gp10b_tegra.c
+++ b/drivers/gpu/nvgpu/common/linux/platform_gp10b_tegra.c
@@ -135,13 +135,13 @@ static int gp10b_tegra_probe(struct device *dev)
         platform->bypass_smmu = !device_is_iommuable(dev);
         platform->disable_bigpage = platform->bypass_smmu;
 
-        platform->g->gr.t18x.ctx_vars.dump_ctxsw_stats_on_channel_close
+        platform->g->gr.ctx_vars.dump_ctxsw_stats_on_channel_close
                 = false;
-        platform->g->gr.t18x.ctx_vars.dump_ctxsw_stats_on_channel_close
+        platform->g->gr.ctx_vars.dump_ctxsw_stats_on_channel_close
                 = false;
 
-        platform->g->gr.t18x.ctx_vars.force_preemption_gfxp = false;
-        platform->g->gr.t18x.ctx_vars.force_preemption_cilp = false;
+        platform->g->gr.ctx_vars.force_preemption_gfxp = false;
+        platform->g->gr.ctx_vars.force_preemption_cilp = false;
 
         gp10b_tegra_get_clocks(dev);
         nvgpu_linux_init_clk_support(platform->g);
@@ -621,86 +621,86 @@ void gr_gp10b_create_sysfs(struct gk20a *g)
            initialized multiple times but we only need to create the ECC
            stats once. Therefore, add the following check to avoid
            creating duplicate stat sysfs nodes. */
-        if (g->ecc.gr.t18x.sm_lrf_single_err_count.counters != NULL)
+        if (g->ecc.gr.sm_lrf_single_err_count.counters != NULL)
                 return;
 
         error |= gr_gp10b_ecc_stat_create(dev,
                                 0,
                                 "sm_lrf_ecc_single_err_count",
-                                &g->ecc.gr.t18x.sm_lrf_single_err_count,
+                                &g->ecc.gr.sm_lrf_single_err_count,
                                 &dev_attr_sm_lrf_ecc_single_err_count_array);
         error |= gr_gp10b_ecc_stat_create(dev,
                                 0,
                                 "sm_lrf_ecc_double_err_count",
-                                &g->ecc.gr.t18x.sm_lrf_double_err_count,
+                                &g->ecc.gr.sm_lrf_double_err_count,
                                 &dev_attr_sm_lrf_ecc_double_err_count_array);
 
         error |= gr_gp10b_ecc_stat_create(dev,
                                 0,
                                 "sm_shm_ecc_sec_count",
-                                &g->ecc.gr.t18x.sm_shm_sec_count,
+                                &g->ecc.gr.sm_shm_sec_count,
                                 &dev_attr_sm_shm_ecc_sec_count_array);
         error |= gr_gp10b_ecc_stat_create(dev,
                                 0,
                                 "sm_shm_ecc_sed_count",
-                                &g->ecc.gr.t18x.sm_shm_sed_count,
+                                &g->ecc.gr.sm_shm_sed_count,
                                 &dev_attr_sm_shm_ecc_sed_count_array);
         error |= gr_gp10b_ecc_stat_create(dev,
                                 0,
                                 "sm_shm_ecc_ded_count",
-                                &g->ecc.gr.t18x.sm_shm_ded_count,
+                                &g->ecc.gr.sm_shm_ded_count,
                                 &dev_attr_sm_shm_ecc_ded_count_array);
 
         error |= gr_gp10b_ecc_stat_create(dev,
                                 0,
                                 "tex_ecc_total_sec_pipe0_count",
-                                &g->ecc.gr.t18x.tex_total_sec_pipe0_count,
+                                &g->ecc.gr.tex_total_sec_pipe0_count,
                                 &dev_attr_tex_ecc_total_sec_pipe0_count_array);
         error |= gr_gp10b_ecc_stat_create(dev,
                                 0,
                                 "tex_ecc_total_ded_pipe0_count",
-                                &g->ecc.gr.t18x.tex_total_ded_pipe0_count,
+                                &g->ecc.gr.tex_total_ded_pipe0_count,
                                 &dev_attr_tex_ecc_total_ded_pipe0_count_array);
         error |= gr_gp10b_ecc_stat_create(dev,
                                 0,
                                 "tex_ecc_unique_sec_pipe0_count",
-                                &g->ecc.gr.t18x.tex_unique_sec_pipe0_count,
+                                &g->ecc.gr.tex_unique_sec_pipe0_count,
                                 &dev_attr_tex_ecc_unique_sec_pipe0_count_array);
         error |= gr_gp10b_ecc_stat_create(dev,
                                 0,
                                 "tex_ecc_unique_ded_pipe0_count",
-                                &g->ecc.gr.t18x.tex_unique_ded_pipe0_count,
+                                &g->ecc.gr.tex_unique_ded_pipe0_count,
                                 &dev_attr_tex_ecc_unique_ded_pipe0_count_array);
         error |= gr_gp10b_ecc_stat_create(dev,
                                 0,
                                 "tex_ecc_total_sec_pipe1_count",
-                                &g->ecc.gr.t18x.tex_total_sec_pipe1_count,
+                                &g->ecc.gr.tex_total_sec_pipe1_count,
                                 &dev_attr_tex_ecc_total_sec_pipe1_count_array);
         error |= gr_gp10b_ecc_stat_create(dev,
                                 0,
                                 "tex_ecc_total_ded_pipe1_count",
-                                &g->ecc.gr.t18x.tex_total_ded_pipe1_count,
+                                &g->ecc.gr.tex_total_ded_pipe1_count,
                                 &dev_attr_tex_ecc_total_ded_pipe1_count_array);
         error |= gr_gp10b_ecc_stat_create(dev,
                                 0,
                                 "tex_ecc_unique_sec_pipe1_count",
-                                &g->ecc.gr.t18x.tex_unique_sec_pipe1_count,
+                                &g->ecc.gr.tex_unique_sec_pipe1_count,
                                 &dev_attr_tex_ecc_unique_sec_pipe1_count_array);
         error |= gr_gp10b_ecc_stat_create(dev,
                                 0,
                                 "tex_ecc_unique_ded_pipe1_count",
-                                &g->ecc.gr.t18x.tex_unique_ded_pipe1_count,
+                                &g->ecc.gr.tex_unique_ded_pipe1_count,
                                 &dev_attr_tex_ecc_unique_ded_pipe1_count_array);
 
         error |= gr_gp10b_ecc_stat_create(dev,
                                 1,
                                 "lts0_ecc_sec_count",
-                                &g->ecc.gr.t18x.l2_sec_count,
+                                &g->ecc.ltc.l2_sec_count,
                                 &dev_attr_l2_ecc_sec_count_array);
         error |= gr_gp10b_ecc_stat_create(dev,
                                 1,
                                 "lts0_ecc_ded_count",
-                                &g->ecc.gr.t18x.l2_ded_count,
+                                &g->ecc.ltc.l2_ded_count,
                                 &dev_attr_l2_ecc_ded_count_array);
 
         if (error)
@@ -713,65 +713,65 @@ static void gr_gp10b_remove_sysfs(struct device *dev)
 
         gr_gp10b_ecc_stat_remove(dev,
                         0,
-                        &g->ecc.gr.t18x.sm_lrf_single_err_count,
+                        &g->ecc.gr.sm_lrf_single_err_count,
                         dev_attr_sm_lrf_ecc_single_err_count_array);
         gr_gp10b_ecc_stat_remove(dev,
                         0,
-                        &g->ecc.gr.t18x.sm_lrf_double_err_count,
+                        &g->ecc.gr.sm_lrf_double_err_count,
                         dev_attr_sm_lrf_ecc_double_err_count_array);
 
         gr_gp10b_ecc_stat_remove(dev,
                         0,
-                        &g->ecc.gr.t18x.sm_shm_sec_count,
+                        &g->ecc.gr.sm_shm_sec_count,
                         dev_attr_sm_shm_ecc_sec_count_array);
         gr_gp10b_ecc_stat_remove(dev,
                         0,
-                        &g->ecc.gr.t18x.sm_shm_sed_count,
+                        &g->ecc.gr.sm_shm_sed_count,
                         dev_attr_sm_shm_ecc_sed_count_array);
         gr_gp10b_ecc_stat_remove(dev,
                         0,
-                        &g->ecc.gr.t18x.sm_shm_ded_count,
+                        &g->ecc.gr.sm_shm_ded_count,
                         dev_attr_sm_shm_ecc_ded_count_array);
 
         gr_gp10b_ecc_stat_remove(dev,
                         0,
-                        &g->ecc.gr.t18x.tex_total_sec_pipe0_count,
+                        &g->ecc.gr.tex_total_sec_pipe0_count,
                         dev_attr_tex_ecc_total_sec_pipe0_count_array);
         gr_gp10b_ecc_stat_remove(dev,
                         0,
-                        &g->ecc.gr.t18x.tex_total_ded_pipe0_count,
+                        &g->ecc.gr.tex_total_ded_pipe0_count,
                         dev_attr_tex_ecc_total_ded_pipe0_count_array);
         gr_gp10b_ecc_stat_remove(dev,
                         0,
-                        &g->ecc.gr.t18x.tex_unique_sec_pipe0_count,
+                        &g->ecc.gr.tex_unique_sec_pipe0_count,
                         dev_attr_tex_ecc_unique_sec_pipe0_count_array);
         gr_gp10b_ecc_stat_remove(dev,
                         0,
-                        &g->ecc.gr.t18x.tex_unique_ded_pipe0_count,
+                        &g->ecc.gr.tex_unique_ded_pipe0_count,
                         dev_attr_tex_ecc_unique_ded_pipe0_count_array);
         gr_gp10b_ecc_stat_remove(dev,
                         0,
-                        &g->ecc.gr.t18x.tex_total_sec_pipe1_count,
+                        &g->ecc.gr.tex_total_sec_pipe1_count,
                         dev_attr_tex_ecc_total_sec_pipe1_count_array);
         gr_gp10b_ecc_stat_remove(dev,
                         0,
-                        &g->ecc.gr.t18x.tex_total_ded_pipe1_count,
+                        &g->ecc.gr.tex_total_ded_pipe1_count,
                         dev_attr_tex_ecc_total_ded_pipe1_count_array);
         gr_gp10b_ecc_stat_remove(dev,
                         0,
-                        &g->ecc.gr.t18x.tex_unique_sec_pipe1_count,
+                        &g->ecc.gr.tex_unique_sec_pipe1_count,
                         dev_attr_tex_ecc_unique_sec_pipe1_count_array);
         gr_gp10b_ecc_stat_remove(dev,
                         0,
-                        &g->ecc.gr.t18x.tex_unique_ded_pipe1_count,
+                        &g->ecc.gr.tex_unique_ded_pipe1_count,
                         dev_attr_tex_ecc_unique_ded_pipe1_count_array);
 
         gr_gp10b_ecc_stat_remove(dev,
                         1,
-                        &g->ecc.gr.t18x.l2_sec_count,
+                        &g->ecc.ltc.l2_sec_count,
                         dev_attr_l2_ecc_sec_count_array);
         gr_gp10b_ecc_stat_remove(dev,
                         1,
-                        &g->ecc.gr.t18x.l2_ded_count,
+                        &g->ecc.ltc.l2_ded_count,
                         dev_attr_l2_ecc_ded_count_array);
 }
diff --git a/drivers/gpu/nvgpu/common/linux/vgpu/gp10b/vgpu_gr_gp10b.c b/drivers/gpu/nvgpu/common/linux/vgpu/gp10b/vgpu_gr_gp10b.c
index efc9c595..fe85e113 100644
--- a/drivers/gpu/nvgpu/common/linux/vgpu/gp10b/vgpu_gr_gp10b.c
+++ b/drivers/gpu/nvgpu/common/linux/vgpu/gp10b/vgpu_gr_gp10b.c
@@ -21,6 +21,7 @@
 #include "common/linux/vgpu/vgpu.h"
 #include "common/linux/vgpu/gm20b/vgpu_gr_gm20b.h"
 
+#include "gp10b/gr_gp10b.h"
 #include "vgpu_gr_gp10b.h"
 
 #include <nvgpu/hw/gp10b/hw_gr_gp10b.h>
@@ -45,10 +46,10 @@ void vgpu_gr_gp10b_free_gr_ctx(struct gk20a *g, struct vm_gk20a *vm,
 
         __nvgpu_vm_free_va(vm, gr_ctx->mem.gpu_va, gmmu_page_size_kernel);
 
-        nvgpu_dma_unmap_free(vm, &gr_ctx->t18x.pagepool_ctxsw_buffer);
-        nvgpu_dma_unmap_free(vm, &gr_ctx->t18x.betacb_ctxsw_buffer);
-        nvgpu_dma_unmap_free(vm, &gr_ctx->t18x.spill_ctxsw_buffer);
-        nvgpu_dma_unmap_free(vm, &gr_ctx->t18x.preempt_ctxsw_buffer);
+        nvgpu_dma_unmap_free(vm, &gr_ctx->pagepool_ctxsw_buffer);
+        nvgpu_dma_unmap_free(vm, &gr_ctx->betacb_ctxsw_buffer);
+        nvgpu_dma_unmap_free(vm, &gr_ctx->spill_ctxsw_buffer);
+        nvgpu_dma_unmap_free(vm, &gr_ctx->preempt_ctxsw_buffer);
 
         nvgpu_kfree(g, gr_ctx);
 }
@@ -122,11 +123,11 @@ int vgpu_gr_gp10b_set_ctxsw_preemption_mode(struct gk20a *g,
         int err = 0;
 
         if (g->ops.gr.is_valid_gfx_class(g, class) &&
-                        g->gr.t18x.ctx_vars.force_preemption_gfxp)
+                        g->gr.ctx_vars.force_preemption_gfxp)
                 graphics_preempt_mode = NVGPU_PREEMPTION_MODE_GRAPHICS_GFXP;
 
         if (g->ops.gr.is_valid_compute_class(g, class) &&
-                        g->gr.t18x.ctx_vars.force_preemption_cilp)
+                        g->gr.ctx_vars.force_preemption_cilp)
                 compute_preempt_mode = NVGPU_PREEMPTION_MODE_COMPUTE_CILP;
 
         /* check for invalid combinations */
@@ -157,54 +158,54 @@ int vgpu_gr_gp10b_set_ctxsw_preemption_mode(struct gk20a *g,
                 attrib_cb_size = ALIGN(attrib_cb_size, 128);
 
                 gk20a_dbg_info("gfxp context preempt size=%d",
-                        g->gr.t18x.ctx_vars.preempt_image_size);
+                        g->gr.ctx_vars.preempt_image_size);
                 gk20a_dbg_info("gfxp context spill size=%d", spill_size);
                 gk20a_dbg_info("gfxp context pagepool size=%d", pagepool_size);
                 gk20a_dbg_info("gfxp context attrib cb size=%d",
                         attrib_cb_size);
 
                 err = gr_gp10b_alloc_buffer(vm,
-                                        g->gr.t18x.ctx_vars.preempt_image_size,
-                                        &gr_ctx->t18x.preempt_ctxsw_buffer);
+                                        g->gr.ctx_vars.preempt_image_size,
+                                        &gr_ctx->preempt_ctxsw_buffer);
                 if (err) {
                         err = -ENOMEM;
                         goto fail;
                 }
-                desc = &gr_ctx->t18x.preempt_ctxsw_buffer;
+                desc = &gr_ctx->preempt_ctxsw_buffer;
                 p->gpu_va[TEGRA_VGPU_GR_BIND_CTXSW_BUFFER_MAIN] = desc->gpu_va;
                 p->size[TEGRA_VGPU_GR_BIND_CTXSW_BUFFER_MAIN] = desc->size;
 
                 err = gr_gp10b_alloc_buffer(vm,
                                         spill_size,
-                                        &gr_ctx->t18x.spill_ctxsw_buffer);
+                                        &gr_ctx->spill_ctxsw_buffer);
                 if (err) {
                         err = -ENOMEM;
                         goto fail;
                 }
-                desc = &gr_ctx->t18x.spill_ctxsw_buffer;
+                desc = &gr_ctx->spill_ctxsw_buffer;
                 p->gpu_va[TEGRA_VGPU_GR_BIND_CTXSW_BUFFER_SPILL] = desc->gpu_va;
                 p->size[TEGRA_VGPU_GR_BIND_CTXSW_BUFFER_SPILL] = desc->size;
 
                 err = gr_gp10b_alloc_buffer(vm,
                                         pagepool_size,
-                                        &gr_ctx->t18x.pagepool_ctxsw_buffer);
+                                        &gr_ctx->pagepool_ctxsw_buffer);
                 if (err) {
                         err = -ENOMEM;
                         goto fail;
                 }
-                desc = &gr_ctx->t18x.pagepool_ctxsw_buffer;
+                desc = &gr_ctx->pagepool_ctxsw_buffer;
                 p->gpu_va[TEGRA_VGPU_GR_BIND_CTXSW_BUFFER_PAGEPOOL] =
                         desc->gpu_va;
                 p->size[TEGRA_VGPU_GR_BIND_CTXSW_BUFFER_PAGEPOOL] = desc->size;
 
                 err = gr_gp10b_alloc_buffer(vm,
                                         attrib_cb_size,
-                                        &gr_ctx->t18x.betacb_ctxsw_buffer);
+                                        &gr_ctx->betacb_ctxsw_buffer);
                 if (err) {
                         err = -ENOMEM;
                         goto fail;
                 }
-                desc = &gr_ctx->t18x.betacb_ctxsw_buffer;
+                desc = &gr_ctx->betacb_ctxsw_buffer;
                 p->gpu_va[TEGRA_VGPU_GR_BIND_CTXSW_BUFFER_BETACB] =
                         desc->gpu_va;
                 p->size[TEGRA_VGPU_GR_BIND_CTXSW_BUFFER_BETACB] = desc->size;
@@ -323,9 +324,9 @@ int vgpu_gr_gp10b_init_ctx_state(struct gk20a *g)
         if (err)
                 return err;
 
-        g->gr.t18x.ctx_vars.preempt_image_size =
+        g->gr.ctx_vars.preempt_image_size =
                         priv->constants.preempt_ctx_size;
-        if (!g->gr.t18x.ctx_vars.preempt_image_size)
+        if (!g->gr.ctx_vars.preempt_image_size)
                 return -EINVAL;
 
         return 0;
diff --git a/drivers/gpu/nvgpu/common/linux/vgpu/gp10b/vgpu_hal_gp10b.c b/drivers/gpu/nvgpu/common/linux/vgpu/gp10b/vgpu_hal_gp10b.c
index da4ca10c..6806b318 100644
--- a/drivers/gpu/nvgpu/common/linux/vgpu/gp10b/vgpu_hal_gp10b.c
+++ b/drivers/gpu/nvgpu/common/linux/vgpu/gp10b/vgpu_hal_gp10b.c
@@ -40,6 +40,7 @@
 #include "gp10b/ce_gp10b.h"
 #include "gp10b/fb_gp10b.h"
 #include "gp10b/pmu_gp10b.h"
+#include "gp10b/gr_gp10b.h"
 #include "gp10b/gr_ctx_gp10b.h"
 #include "gp10b/fifo_gp10b.h"
 #include "gp10b/gp10b_gating_reglist.h"
diff --git a/drivers/gpu/nvgpu/common/linux/vgpu/gv11b/vgpu_hal_gv11b.c b/drivers/gpu/nvgpu/common/linux/vgpu/gv11b/vgpu_hal_gv11b.c
index 6b5a1b0d..a7491b20 100644
--- a/drivers/gpu/nvgpu/common/linux/vgpu/gv11b/vgpu_hal_gv11b.c
+++ b/drivers/gpu/nvgpu/common/linux/vgpu/gv11b/vgpu_hal_gv11b.c
@@ -48,6 +48,7 @@
 #include <gp10b/mm_gp10b.h>
 #include <gp10b/mc_gp10b.h>
 #include <gp10b/ce_gp10b.h>
+#include "gp10b/gr_gp10b.h"
 #include <gp10b/fifo_gp10b.h>
 #include <gp10b/therm_gp10b.h>
 #include <gp10b/priv_ring_gp10b.h>