gpu: nvgpu: gp10b: Rewrite compbit backing store calc

Compbit backing store did not take into account number of GOBS
per comptagline per slice.

Bug 1604102

Change-Id: I42666e72ea54697b6fbc7318e65a6a09d867f5b6
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/754706
GVS: Gerrit_Virtual_Submit
Reviewed-by: Sami Kiminki <skiminki@nvidia.com>

1 files changed, 5 insertions, 9 deletions

diff --git a/drivers/gpu/nvgpu/gp10b/ltc_gp10b.c b/drivers/gpu/nvgpu/gp10b/ltc_gp10b.c
index 68f4eafa..d6fca6e4 100644
--- a/drivers/gpu/nvgpu/gp10b/ltc_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/ltc_gp10b.c
@@ -80,8 +80,11 @@ static int gp10b_ltc_init_comptags(struct gk20a *g, struct gr_gk20a *gr)
                 max_comptag_lines = hw_max_comptag_lines;
 
         compbit_backing_size =
-                DIV_ROUND_UP(max_comptag_lines, comptags_per_cacheline) *
-                cacheline_size * slices_per_ltc * g->ltc_count;
+                roundup(max_comptag_lines * gobs_per_comptagline_per_slice,
+                        cacheline_size);
+        compbit_backing_size =
+                roundup(compbit_backing_size * slices_per_ltc * g->ltc_count,
+                        g->ops.fb.compressible_page_size(g));
 
         /* aligned to 2KB * ltc_count */
         compbit_backing_size +=
@@ -90,13 +93,6 @@ static int gp10b_ltc_init_comptags(struct gk20a *g, struct gr_gk20a *gr)
         /* must be a multiple of 64KB */
         compbit_backing_size = roundup(compbit_backing_size, 64*1024);
 
-        max_comptag_lines =
-                (compbit_backing_size * comptags_per_cacheline) /
-                (cacheline_size * slices_per_ltc * g->ltc_count);
-
-        if (max_comptag_lines > hw_max_comptag_lines)
-                max_comptag_lines = hw_max_comptag_lines;
-
         gk20a_dbg_info("compbit backing store size : %d",
                 compbit_backing_size);
         gk20a_dbg_info("max comptag lines : %d",