2 files changed, 6 insertions, 4 deletions

diff --git a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c
index 20a0b34f..05763cce 100644
--- a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c
@@ -25,6 +25,8 @@
 #include "common/bus/bus_gk20a.h"
 #include "common/bus/bus_gp10b.h"
 #include "common/bus/bus_gm20b.h"
+#include "common/priv_ring/priv_ring_gm20b.h"
+#include "common/priv_ring/priv_ring_gp10b.h"
 #include "common/clock_gating/gv11b_gating_reglist.h"
 #include "common/ptimer/ptimer_gk20a.h"
 #include "common/fb/fb_gk20a.h"
@@ -55,7 +57,6 @@
 #include "gp10b/therm_gp10b.h"
 #include "gp10b/mc_gp10b.h"
 #include "gp10b/ce_gp10b.h"
-#include "gp10b/priv_ring_gp10b.h"
 #include "gp10b/fifo_gp10b.h"
 #include "gp10b/fecs_trace_gp10b.h"
 #include "gp10b/mm_gp10b.h"
@@ -786,10 +787,12 @@ static const struct gpu_ops gv11b_ops = {
                 .falcon_hal_sw_init = gk20a_falcon_hal_sw_init,
         },
         .priv_ring = {
+                .enable_priv_ring = gm20b_priv_ring_enable,
                 .isr = gp10b_priv_ring_isr,
                 .decode_error_code = gp10b_priv_ring_decode_error_code,
                 .set_ppriv_timeout_settings =
-                        gk20a_priv_set_timeout_settings,
+                        gm20b_priv_set_timeout_settings,
+                .enum_ltc = gm20b_priv_ring_enum_ltc,
         },
         .fuse = {
                 .check_priv_security = gp10b_fuse_check_priv_security,
diff --git a/drivers/gpu/nvgpu/gv11b/ltc_gv11b.c b/drivers/gpu/nvgpu/gv11b/ltc_gv11b.c
index 32f72208..d7c385a9 100644
--- a/drivers/gpu/nvgpu/gv11b/ltc_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/ltc_gv11b.c
@@ -32,7 +32,6 @@
 #include <nvgpu/hw/gv11b/hw_mc_gv11b.h>
 #include <nvgpu/hw/gv11b/hw_top_gv11b.h>
 #include <nvgpu/hw/gv11b/hw_mc_gv11b.h>
-#include <nvgpu/hw/gv11b/hw_pri_ringmaster_gv11b.h>
 
 #include <nvgpu/utils.h>
 
@@ -62,7 +61,7 @@ void gv11b_ltc_init_fs_state(struct gk20a *g)
         nvgpu_log_info(g, "initialize gv11b l2");
 
         g->max_ltc_count = gk20a_readl(g, top_num_ltcs_r());
-        g->ltc_count = gk20a_readl(g, pri_ringmaster_enum_ltc_r());
+        g->ltc_count = g->ops.priv_ring.enum_ltc(g);
         nvgpu_log_info(g, "%u ltcs out of %u", g->ltc_count, g->max_ltc_count);
 
         reg = gk20a_readl(g, ltc_ltcs_ltss_cbc_param_r());