5 files changed, 25 insertions, 8 deletions

diff --git a/drivers/gpu/nvgpu/common/ltc/ltc_gm20b.c b/drivers/gpu/nvgpu/common/ltc/ltc_gm20b.c
index 623b0935..205b712d 100644
--- a/drivers/gpu/nvgpu/common/ltc/ltc_gm20b.c
+++ b/drivers/gpu/nvgpu/common/ltc/ltc_gm20b.c
@@ -93,7 +93,7 @@ int gm20b_ltc_init_comptags(struct gk20a *g, struct gr_gk20a *gr)
         nvgpu_log_info(g, "max comptag lines : %d",
                 max_comptag_lines);
 
-        err = nvgpu_ltc_alloc_cbc(g, compbit_backing_size);
+        err = nvgpu_ltc_alloc_cbc(g, compbit_backing_size, false);
         if (err) {
                 return err;
         }
diff --git a/drivers/gpu/nvgpu/common/ltc/ltc_gp10b.c b/drivers/gpu/nvgpu/common/ltc/ltc_gp10b.c
index b72346ee..f4edbdb2 100644
--- a/drivers/gpu/nvgpu/common/ltc/ltc_gp10b.c
+++ b/drivers/gpu/nvgpu/common/ltc/ltc_gp10b.c
@@ -117,7 +117,7 @@ int gp10b_ltc_init_comptags(struct gk20a *g, struct gr_gk20a *gr)
         nvgpu_log_info(g, "gobs_per_comptagline_per_slice: %d",
                 gobs_per_comptagline_per_slice);
 
-        err = nvgpu_ltc_alloc_cbc(g, compbit_backing_size);
+        err = nvgpu_ltc_alloc_cbc(g, compbit_backing_size, false);
         if (err) {
                 return err;
         }
diff --git a/drivers/gpu/nvgpu/include/nvgpu/ltc.h b/drivers/gpu/nvgpu/include/nvgpu/ltc.h
index 60aa5424..21edcba7 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/ltc.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/ltc.h
@@ -29,6 +29,7 @@ struct gk20a;
 
 int nvgpu_init_ltc_support(struct gk20a *g);
 void nvgpu_ltc_sync_enabled(struct gk20a *g);
-int nvgpu_ltc_alloc_cbc(struct gk20a *g, size_t compbit_backing_size);
+int nvgpu_ltc_alloc_cbc(struct gk20a *g, size_t compbit_backing_size,
+                        bool vidmem_alloc);
 
 #endif
diff --git a/drivers/gpu/nvgpu/os/linux/ltc.c b/drivers/gpu/nvgpu/os/linux/ltc.c
index 1a58bc4e..8011f762 100644
--- a/drivers/gpu/nvgpu/os/linux/ltc.c
+++ b/drivers/gpu/nvgpu/os/linux/ltc.c
@@ -27,7 +27,8 @@
 #include "gk20a/gk20a.h"
 #include "gk20a/gr_gk20a.h"
 
-int nvgpu_ltc_alloc_cbc(struct gk20a *g, size_t compbit_backing_size)
+int nvgpu_ltc_alloc_cbc(struct gk20a *g, size_t compbit_backing_size,
+                        bool vidmem_alloc)
 {
         struct gr_gk20a *gr = &g->gr;
         unsigned long flags = 0;
@@ -35,11 +36,25 @@ int nvgpu_ltc_alloc_cbc(struct gk20a *g, size_t compbit_backing_size)
         if (nvgpu_mem_is_valid(&gr->compbit_store.mem))
                 return 0;
 
-        if (!nvgpu_iommuable(g))
-                flags = NVGPU_DMA_FORCE_CONTIGUOUS;
+        if (vidmem_alloc) {
+                /*
+                 * Backing store MUST be physically contiguous and allocated in
+                 * one chunk
+                 * Vidmem allocation API does not support FORCE_CONTIGUOUS like
+                 * flag to allocate contiguous memory
+                 * But this allocation will happen in vidmem bootstrap allocator
+                 * which always allocates contiguous memory
+                 */
+                return nvgpu_dma_alloc_vid(g,
+                                         compbit_backing_size,
+                                         &gr->compbit_store.mem);
+        } else {
+                if (!nvgpu_iommuable(g))
+                        flags = NVGPU_DMA_FORCE_CONTIGUOUS;
 
-        return nvgpu_dma_alloc_flags_sys(g,
+                return nvgpu_dma_alloc_flags_sys(g,
                                          flags,
                                          compbit_backing_size,
                                          &gr->compbit_store.mem);
+        }
 }
diff --git a/drivers/gpu/nvgpu/os/posix/stubs.c b/drivers/gpu/nvgpu/os/posix/stubs.c
index 1e50930a..279f4daa 100644
--- a/drivers/gpu/nvgpu/os/posix/stubs.c
+++ b/drivers/gpu/nvgpu/os/posix/stubs.c
@@ -43,7 +43,8 @@ void nvgpu_ecc_sysfs_remove(struct gk20a *g)
 {
 }
 
-int nvgpu_ltc_alloc_cbc(struct gk20a *g, size_t compbit_backing_size)
+int nvgpu_ltc_alloc_cbc(struct gk20a *g, size_t compbit_backing_size,
+                        bool vidmem_alloc)
 {
         return 0;
 }