6 files changed, 41 insertions, 9 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h
index 6ca5855a..7df2c2e0 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.h
@@ -618,6 +618,10 @@ struct gpu_ops {
                 int (*pmu_setup_hw_and_bootstrap)(struct gk20a *g);
                 int (*pmu_nsbootstrap)(struct pmu_gk20a *pmu);
                 int (*pmu_setup_elpg)(struct gk20a *g);
+                u32 (*pmu_get_queue_head)(u32 i);
+                u32 (*pmu_get_queue_head_size)(void);
+                u32 (*pmu_get_queue_tail_size)(void);
+                u32 (*pmu_get_queue_tail)(u32 i);
                 int (*init_wpr_region)(struct gk20a *g);
                 int (*load_lsfalcon_ucode)(struct gk20a *g, u32 falconidmask);
                 void (*write_dmatrfbase)(struct gk20a *g, u32 addr);
diff --git a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
index c9eb25fe..26ed3a49 100644
--- a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
@@ -2625,21 +2625,25 @@ static int pmu_queue_head(struct pmu_gk20a *pmu, struct pmu_queue *queue,
                         u32 *head, bool set)
 {
         struct gk20a *g = gk20a_from_pmu(pmu);
+        u32 queue_head_size = 0;
 
-        BUG_ON(!head);
+        if (g->ops.pmu.pmu_get_queue_head_size)
+                queue_head_size = g->ops.pmu.pmu_get_queue_head_size();
+
+        BUG_ON(!head || !queue_head_size);
 
         if (PMU_IS_COMMAND_QUEUE(queue->id)) {
 
-                if (queue->index >= pwr_pmu_queue_head__size_1_v())
+                if (queue->index >= queue_head_size)
                         return -EINVAL;
 
                 if (!set)
                         *head = pwr_pmu_queue_head_address_v(
                                 gk20a_readl(g,
-                                        pwr_pmu_queue_head_r(queue->index)));
+                                g->ops.pmu.pmu_get_queue_head(queue->index)));
                 else
                         gk20a_writel(g,
-                                pwr_pmu_queue_head_r(queue->index),
+                                g->ops.pmu.pmu_get_queue_head(queue->index),
                                 pwr_pmu_queue_head_address_f(*head));
         } else {
                 if (!set)
@@ -2658,21 +2662,25 @@ static int pmu_queue_tail(struct pmu_gk20a *pmu, struct pmu_queue *queue,
                         u32 *tail, bool set)
 {
         struct gk20a *g = gk20a_from_pmu(pmu);
+        u32 queue_tail_size = 0;
+
+        if (g->ops.pmu.pmu_get_queue_tail_size)
+                queue_tail_size = g->ops.pmu.pmu_get_queue_tail_size();
 
-        BUG_ON(!tail);
+        BUG_ON(!tail || !queue_tail_size);
 
         if (PMU_IS_COMMAND_QUEUE(queue->id)) {
 
-                if (queue->index >= pwr_pmu_queue_tail__size_1_v())
+                if (queue->index >= queue_tail_size)
                         return -EINVAL;
 
                 if (!set)
                         *tail = pwr_pmu_queue_tail_address_v(
-                                gk20a_readl(g,
-                                        pwr_pmu_queue_tail_r(queue->index)));
+                        gk20a_readl(g,
+                                g->ops.pmu.pmu_get_queue_tail(queue->index)));
                 else
                         gk20a_writel(g,
-                                pwr_pmu_queue_tail_r(queue->index),
+                                g->ops.pmu.pmu_get_queue_tail(queue->index),
                                 pwr_pmu_queue_tail_address_f(*tail));
 
         } else {
@@ -3445,6 +3453,10 @@ void gk20a_init_pmu_ops(struct gpu_ops *gops)
         gops->pmu.prepare_ucode = gk20a_prepare_ucode;
         gops->pmu.pmu_setup_hw_and_bootstrap = gk20a_init_pmu_setup_hw1;
         gops->pmu.pmu_nsbootstrap = pmu_bootstrap;
+        gops->pmu.pmu_get_queue_head = pwr_pmu_queue_head_r;
+        gops->pmu.pmu_get_queue_head_size = pwr_pmu_queue_head__size_1_v;
+        gops->pmu.pmu_get_queue_tail = pwr_pmu_queue_tail_r;
+        gops->pmu.pmu_get_queue_tail_size = pwr_pmu_queue_tail__size_1_v;
         gops->pmu.pmu_setup_elpg = NULL;
         gops->pmu.init_wpr_region = NULL;
         gops->pmu.load_lsfalcon_ucode = NULL;
diff --git a/drivers/gpu/nvgpu/gm206/pmu_gm206.c b/drivers/gpu/nvgpu/gm206/pmu_gm206.c
index 2b3c1b50..ffcf0bf1 100644
--- a/drivers/gpu/nvgpu/gm206/pmu_gm206.c
+++ b/drivers/gpu/nvgpu/gm206/pmu_gm206.c
@@ -153,6 +153,10 @@ void gm206_init_pmu_ops(struct gpu_ops *gops)
                 gops->pmu.init_wpr_region = NULL;
         }
         gops->pmu.pmu_setup_elpg = NULL;
+        gops->pmu.pmu_get_queue_head = pwr_pmu_queue_head_r;
+        gops->pmu.pmu_get_queue_head_size = pwr_pmu_queue_head__size_1_v;
+        gops->pmu.pmu_get_queue_tail = pwr_pmu_queue_tail_r;
+        gops->pmu.pmu_get_queue_tail_size = pwr_pmu_queue_tail__size_1_v;
         gops->pmu.lspmuwprinitdone = 0;
         gops->pmu.fecsbootstrapdone = false;
         gops->pmu.write_dmatrfbase = gm20b_write_dmatrfbase;
diff --git a/drivers/gpu/nvgpu/gm20b/pmu_gm20b.c b/drivers/gpu/nvgpu/gm20b/pmu_gm20b.c
index 4b87b877..3c09600d 100644
--- a/drivers/gpu/nvgpu/gm20b/pmu_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/pmu_gm20b.c
@@ -289,6 +289,10 @@ void gm20b_init_pmu_ops(struct gpu_ops *gops)
                 gops->pmu.init_wpr_region = NULL;
         }
         gops->pmu.pmu_setup_elpg = gm20b_pmu_setup_elpg;
+        gops->pmu.pmu_get_queue_head = pwr_pmu_queue_head_r;
+        gops->pmu.pmu_get_queue_head_size = pwr_pmu_queue_head__size_1_v;
+        gops->pmu.pmu_get_queue_tail = pwr_pmu_queue_tail_r;
+        gops->pmu.pmu_get_queue_tail_size = pwr_pmu_queue_tail__size_1_v;
         gops->pmu.lspmuwprinitdone = 0;
         gops->pmu.fecsbootstrapdone = false;
         gops->pmu.write_dmatrfbase = gm20b_write_dmatrfbase;
diff --git a/drivers/gpu/nvgpu/gp106/pmu_gp106.c b/drivers/gpu/nvgpu/gp106/pmu_gp106.c
index 8d552a5b..9aac5328 100644
--- a/drivers/gpu/nvgpu/gp106/pmu_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/pmu_gp106.c
@@ -317,6 +317,10 @@ void gp106_init_pmu_ops(struct gpu_ops *gops)
                 gops->pmu.init_wpr_region = NULL;
         }
         gops->pmu.pmu_setup_elpg = NULL;
+        gops->pmu.pmu_get_queue_head = pwr_pmu_queue_head_r;
+        gops->pmu.pmu_get_queue_head_size = pwr_pmu_queue_head__size_1_v;
+        gops->pmu.pmu_get_queue_tail = pwr_pmu_queue_tail_r;
+        gops->pmu.pmu_get_queue_tail_size = pwr_pmu_queue_tail__size_1_v;
         gops->pmu.lspmuwprinitdone = 0;
         gops->pmu.fecsbootstrapdone = false;
         gops->pmu.write_dmatrfbase = gp10b_write_dmatrfbase;
diff --git a/drivers/gpu/nvgpu/gp10b/pmu_gp10b.c b/drivers/gpu/nvgpu/gp10b/pmu_gp10b.c
index cf216941..d31ea03b 100644
--- a/drivers/gpu/nvgpu/gp10b/pmu_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/pmu_gp10b.c
@@ -480,6 +480,10 @@ void gp10b_init_pmu_ops(struct gpu_ops *gops)
                 gops->pmu.pmu_setup_hw_and_bootstrap = gp10b_init_pmu_setup_hw1;
         }
         gops->pmu.pmu_setup_elpg = gp10b_pmu_setup_elpg;
+        gops->pmu.pmu_get_queue_head = pwr_pmu_queue_head_r;
+        gops->pmu.pmu_get_queue_head_size = pwr_pmu_queue_head__size_1_v;
+        gops->pmu.pmu_get_queue_tail = pwr_pmu_queue_tail_r;
+        gops->pmu.pmu_get_queue_tail_size = pwr_pmu_queue_tail__size_1_v;
         gops->pmu.lspmuwprinitdone = false;
         gops->pmu.fecsbootstrapdone = false;
         gops->pmu.write_dmatrfbase = gp10b_write_dmatrfbase;