2 files changed, 5 insertions, 4 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
index 0e21f749..ef26a74e 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
@@ -4776,9 +4776,11 @@ static int gk20a_init_gr_setup_sw(struct gk20a *g)
         if (err)
                 goto clean_up;
 
-        err = g->ops.ltc.init_comptags(g, gr);
-        if (err)
-                goto clean_up;
+        if (g->ops.ltc.init_comptags) {
+                err = g->ops.ltc.init_comptags(g, gr);
+                if (err)
+                        goto clean_up;
+        }
 
         err = gr_gk20a_init_zcull(g, gr);
         if (err)
diff --git a/drivers/gpu/nvgpu/gv100/hal_gv100.c b/drivers/gpu/nvgpu/gv100/hal_gv100.c
index c10df2cb..6f4ab875 100644
--- a/drivers/gpu/nvgpu/gv100/hal_gv100.c
+++ b/drivers/gpu/nvgpu/gv100/hal_gv100.c
@@ -267,7 +267,6 @@ static const struct gpu_ops gv100_ops = {
                 .set_zbc_depth_entry = gm20b_ltc_set_zbc_depth_entry,
                 .init_cbc = NULL,
                 .init_fs_state = gv11b_ltc_init_fs_state,
-                .init_comptags = gp10b_ltc_init_comptags,
                 .cbc_ctrl = gp10b_ltc_cbc_ctrl,
                 .isr = gv11b_ltc_isr,
                 .cbc_fix_config = NULL,