gpu: nvgpu: Add HAL for add ZBC color & depth

Turn add ZBC functions into HALs that can be filled per chip.

Bug 1567274

Change-Id: Ic6ef29d3353d4a0079ea0c80f513ffd579fe554f
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/601109
Reviewed-by: Automatic_Commit_Validation_User

4 files changed, 24 insertions, 10 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h
index 49038a0f..0bbc66cf 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.h
@@ -139,6 +139,10 @@ struct gpu_ops {
                 bool (*is_tpc_addr)(u32 addr);
                 u32 (*get_tpc_num)(u32 addr);
                 void (*detect_sm_arch)(struct gk20a *g);
+                int (*add_zbc_color)(struct gk20a *g, struct gr_gk20a *gr,
+                                  struct zbc_entry *color_val, u32 index);
+                int (*add_zbc_depth)(struct gk20a *g, struct gr_gk20a *gr,
+                                  struct zbc_entry *depth_val, u32 index);
         } gr;
         const char *name;
         struct {
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
index 3cf5845c..36636d4f 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
@@ -285,8 +285,8 @@ static void gr_gk20a_load_falcon_imem(struct gk20a *g)
         }
 }
 
-static int gr_gk20a_wait_idle(struct gk20a *g, unsigned long end_jiffies,
-                u32 expect_delay)
+int gr_gk20a_wait_idle(struct gk20a *g, unsigned long end_jiffies,
+                       u32 expect_delay)
 {
         u32 delay = expect_delay;
         bool gr_enabled;
@@ -3512,8 +3512,8 @@ static void gr_gk20a_detect_sm_arch(struct gk20a *g)
                 gr_gpc0_tpc0_sm_arch_warp_count_v(v);
 }
 
-static int gr_gk20a_add_zbc_color(struct gk20a *g, struct gr_gk20a *gr,
-                                  struct zbc_entry *color_val, u32 index)
+int gr_gk20a_add_zbc_color(struct gk20a *g, struct gr_gk20a *gr,
+                           struct zbc_entry *color_val, u32 index)
 {
         struct fifo_gk20a *f = &g->fifo;
         struct fifo_engine_info_gk20a *gr_info = f->engine_info + ENGINE_GR_GK20A;
@@ -3579,8 +3579,8 @@ clean_up:
         return ret;
 }
 
-static int gr_gk20a_add_zbc_depth(struct gk20a *g, struct gr_gk20a *gr,
-                                struct zbc_entry *depth_val, u32 index)
+int gr_gk20a_add_zbc_depth(struct gk20a *g, struct gr_gk20a *gr,
+                           struct zbc_entry *depth_val, u32 index)
 {
         struct fifo_gk20a *f = &g->fifo;
         struct fifo_engine_info_gk20a *gr_info = f->engine_info + ENGINE_GR_GK20A;
@@ -3716,7 +3716,7 @@ int gr_gk20a_add_zbc(struct gk20a *g, struct gr_gk20a *gr,
                             &gr->zbc_col_tbl[gr->max_used_color_index];
                         WARN_ON(c_tbl->ref_cnt != 0);
 
-                        ret = gr_gk20a_add_zbc_color(g, gr,
+                        ret = g->ops.gr.add_zbc_color(g, gr,
                                 zbc_val, gr->max_used_color_index);
 
                         if (!ret)
@@ -3746,7 +3746,7 @@ int gr_gk20a_add_zbc(struct gk20a *g, struct gr_gk20a *gr,
                             &gr->zbc_dep_tbl[gr->max_used_depth_index];
                         WARN_ON(d_tbl->ref_cnt != 0);
 
-                        ret = gr_gk20a_add_zbc_depth(g, gr,
+                        ret = g->ops.gr.add_zbc_depth(g, gr,
                                 zbc_val, gr->max_used_depth_index);
 
                         if (!ret)
@@ -3834,7 +3834,7 @@ static int gr_gk20a_load_zbc_table(struct gk20a *g, struct gr_gk20a *gr)
                        c_tbl->color_l2, sizeof(zbc_val.color_l2));
                 zbc_val.format = c_tbl->format;
 
-                ret = gr_gk20a_add_zbc_color(g, gr, &zbc_val, i);
+                ret = g->ops.gr.add_zbc_color(g, gr, &zbc_val, i);
 
                 if (ret)
                         return ret;
@@ -3847,7 +3847,7 @@ static int gr_gk20a_load_zbc_table(struct gk20a *g, struct gr_gk20a *gr)
                 zbc_val.depth = d_tbl->depth;
                 zbc_val.format = d_tbl->format;
 
-                ret = gr_gk20a_add_zbc_depth(g, gr, &zbc_val, i);
+                ret = g->ops.gr.add_zbc_depth(g, gr, &zbc_val, i);
                 if (ret)
                         return ret;
         }
@@ -7351,5 +7351,7 @@ void gk20a_init_gr_ops(struct gpu_ops *gops)
         gops->gr.is_tpc_addr = gr_gk20a_is_tpc_addr;
         gops->gr.get_tpc_num = gr_gk20a_get_tpc_num;
         gops->gr.detect_sm_arch = gr_gk20a_detect_sm_arch;
+        gops->gr.add_zbc_color = gr_gk20a_add_zbc_color;
+        gops->gr.add_zbc_depth = gr_gk20a_add_zbc_depth;
 }
 
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.h b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
index 72642a41..e5d315e5 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
@@ -456,4 +456,10 @@ void gk20a_suspend_all_sms(struct gk20a *g);
 int gk20a_gr_lock_down_sm(struct gk20a *g,
                                  u32 gpc, u32 tpc, u32 global_esr_mask);
 bool gk20a_is_channel_ctx_resident(struct channel_gk20a *ch);
+int gr_gk20a_add_zbc_color(struct gk20a *g, struct gr_gk20a *gr,
+                           struct zbc_entry *color_val, u32 index);
+int gr_gk20a_add_zbc_depth(struct gk20a *g, struct gr_gk20a *gr,
+                           struct zbc_entry *depth_val, u32 index);
+int gr_gk20a_wait_idle(struct gk20a *g, unsigned long end_jiffies,
+                       u32 expect_delay);
 #endif /*__GR_GK20A_H__*/
diff --git a/drivers/gpu/nvgpu/gm20b/gr_gm20b.c b/drivers/gpu/nvgpu/gm20b/gr_gm20b.c
index 93ad5e8e..67bfb430 100644
--- a/drivers/gpu/nvgpu/gm20b/gr_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/gr_gm20b.c
@@ -805,4 +805,6 @@ void gm20b_init_gr(struct gpu_ops *gops)
         gops->gr.is_tpc_addr = gr_gm20b_is_tpc_addr;
         gops->gr.get_tpc_num = gr_gm20b_get_tpc_num;
         gops->gr.detect_sm_arch = gr_gm20b_detect_sm_arch;
+        gops->gr.add_zbc_color = gr_gk20a_add_zbc_color;
+        gops->gr.add_zbc_depth = gr_gk20a_add_zbc_depth;
 }