6 files changed, 19 insertions, 16 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/fb_gk20a.c b/drivers/gpu/nvgpu/gk20a/fb_gk20a.c
index d5b3fd87..568aed7a 100644
--- a/drivers/gpu/nvgpu/gk20a/fb_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/fb_gk20a.c
@@ -42,10 +42,16 @@ static void gk20a_fb_set_mmu_page_size(struct gk20a *g)
         gk20a_writel(g, fb_mmu_ctrl_r(), fb_mmu_ctrl);
 }
 
+static int gk20a_fb_compression_page_size(struct gk20a *g)
+{
+        return SZ_128K;
+}
+
 void gk20a_init_fb(struct gpu_ops *gops)
 {
         gops->fb.reset = fb_gk20a_reset;
         gops->fb.set_mmu_page_size = gk20a_fb_set_mmu_page_size;
+        gops->fb.compression_page_size = gk20a_fb_compression_page_size;
         gk20a_init_uncompressed_kind_map();
         gk20a_init_kind_attr();
 }
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c
index 6c18c895..57d5f09a 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.c
@@ -1788,7 +1788,7 @@ int gk20a_init_gpu_characteristics(struct gk20a *g)
         gpu->bus_type = NVGPU_GPU_BUS_TYPE_AXI; /* always AXI for now */
 
         gpu->big_page_size = g->mm.pmu.vm.big_page_size;
-        gpu->compression_page_size = g->mm.pmu.vm.compression_page_size;
+        gpu->compression_page_size = g->ops.fb.compression_page_size(g);
         gpu->pde_coverage_bit_count = g->mm.pmu.vm.pde_stride_shift;
 
         gpu->available_big_page_sizes = gpu->big_page_size;
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h
index b9796faa..4fbc25be 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.h
@@ -167,6 +167,7 @@ struct gpu_ops {
                 void (*init_uncompressed_kind_map)(struct gk20a *g);
                 void (*init_kind_attr)(struct gk20a *g);
                 void (*set_mmu_page_size)(struct gk20a *g);
+                int (*compression_page_size)(struct gk20a *g);
         } fb;
         struct {
                 void (*slcg_bus_load_gating_prod)(struct gk20a *g, bool prod);
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.h b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
index f130b830..cd6fe9cb 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
@@ -258,9 +258,6 @@ struct gr_gk20a {
         u32 map_tile_count;
         u32 map_row_offset;
 
-#define COMP_TAG_LINE_SIZE_SHIFT        (17)    /* one tag covers 128K */
-#define COMP_TAG_LINE_SIZE              (1 << COMP_TAG_LINE_SIZE_SHIFT)
-
         u32 max_comptag_mem; /* max memory size (MB) for comptag */
         struct compbit_store_desc compbit_store;
         struct gk20a_allocator comp_tags;
diff --git a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c
index 3bce3c74..6b7f84a3 100644
--- a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c
@@ -1001,7 +1001,9 @@ static int setup_buffer_kind_and_compression(struct vm_gk20a *vm,
                                              enum gmmu_pgsz_gk20a pgsz_idx)
 {
         bool kind_compressible;
-        struct device *d = dev_from_gk20a(vm->mm->g);
+        struct gk20a *g = gk20a_from_vm(vm);
+        struct device *d = dev_from_gk20a(g);
+        int ctag_granularity = g->ops.fb.compression_page_size(g);
 
         if (unlikely(bfr->kind_v == gmmu_pte_kind_invalid_v()))
                 bfr->kind_v = gmmu_pte_kind_pitch_v();
@@ -1036,8 +1038,7 @@ static int setup_buffer_kind_and_compression(struct vm_gk20a *vm,
                 kind_compressible = false;
         }
         if (kind_compressible)
-                bfr->ctag_lines = ALIGN(bfr->size, COMP_TAG_LINE_SIZE) >>
-                        COMP_TAG_LINE_SIZE_SHIFT;
+                bfr->ctag_lines = DIV_ROUND_UP_ULL(bfr->size, ctag_granularity);
         else
                 bfr->ctag_lines = 0;
 
@@ -1113,10 +1114,10 @@ u64 gk20a_locked_gmmu_map(struct vm_gk20a *vm,
         u32 pde_lo, pde_hi;
         struct device *d = dev_from_vm(vm);
         struct gk20a *g = gk20a_from_vm(vm);
+        int ctag_granularity = g->ops.fb.compression_page_size(g);
 
         if (clear_ctags && ctag_offset) {
-                u32 ctag_lines = ALIGN(size, COMP_TAG_LINE_SIZE) >>
-                                        COMP_TAG_LINE_SIZE_SHIFT;
+                u32 ctag_lines = DIV_ROUND_UP_ULL(size, ctag_granularity);
 
                 /* init/clear the ctag buffer */
                 g->ops.ltc.cbc_ctrl(g, gk20a_cbc_op_clear,
@@ -1756,7 +1757,9 @@ static int update_gmmu_ptes_locked(struct vm_gk20a *vm,
         struct scatterlist *cur_chunk;
         unsigned int cur_offset;
         u32 pte_w[2] = {0, 0}; /* invalid pte */
-        u32 ctag = ctag_offset * SZ_128K;
+        struct gk20a *g = gk20a_from_vm(vm);
+        u32 ctag_granularity = g->ops.fb.compression_page_size(g);
+        u32 ctag = ctag_offset * ctag_granularity;
         u32 ctag_incr;
         u32 page_size  = vm->gmmu_page_sizes[pgsz_idx];
         u64 addr = 0;
@@ -1768,9 +1771,6 @@ static int update_gmmu_ptes_locked(struct vm_gk20a *vm,
         gk20a_dbg(gpu_dbg_pte, "size_idx=%d, pde_lo=%d, pde_hi=%d",
                    pgsz_idx, pde_lo, pde_hi);
 
-        /* If ctag_offset !=0 add 1 else add 0.  The idea is to avoid a branch
-         * below (per-pte). Note: this doesn't work unless page size (when
-         * comptags are active) is 128KB. We have checks elsewhere for that. */
         ctag_incr = ctag_offset ? page_size : 0;
 
         cur_offset = 0;
@@ -1843,7 +1843,8 @@ static int update_gmmu_ptes_locked(struct vm_gk20a *vm,
                                                 >> gmmu_pte_address_shift_v());
                                 pte_w[1] = gmmu_pte_aperture_video_memory_f() |
                                         gmmu_pte_kind_f(kind_v) |
-                                        gmmu_pte_comptagline_f(ctag / SZ_128K);
+                                        gmmu_pte_comptagline_f(ctag
+                                                        / ctag_granularity);
 
                                 if (rw_flag == gk20a_mem_flag_read_only) {
                                         pte_w[0] |= gmmu_pte_read_only_true_f();
@@ -2161,7 +2162,6 @@ int gk20a_init_vm(struct mm_gk20a *mm,
         vm->big_pages = big_pages;
 
         vm->big_page_size = gmmu_page_sizes[gmmu_page_size_big];
-        vm->compression_page_size = gmmu_page_sizes[gmmu_page_size_big];
         vm->pde_stride    = vm->big_page_size << 10;
         vm->pde_stride_shift = ilog2(vm->pde_stride);
 
diff --git a/drivers/gpu/nvgpu/gk20a/mm_gk20a.h b/drivers/gpu/nvgpu/gk20a/mm_gk20a.h
index 8470a7ac..e4fc3085 100644
--- a/drivers/gpu/nvgpu/gk20a/mm_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/mm_gk20a.h
@@ -293,7 +293,6 @@ struct vm_gk20a {
         bool tlb_dirty;
         bool mapped;
 
-        u32 compression_page_size;
         u32 big_page_size;
         u32 pde_stride;
         u32 pde_stride_shift;