3 files changed, 2 insertions, 69 deletions

diff --git a/drivers/gpu/nvgpu/include/nvgpu/gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/gk20a.h
index bb46d85c..e1b44b52 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/gk20a.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/gk20a.h
@@ -549,7 +549,8 @@ struct gpu_ops {
                  */
                 u32 (*compression_align_mask)(struct gk20a *g);
 
-                void (*dump_vpr_wpr_info)(struct gk20a *g);
+                void (*dump_vpr_info)(struct gk20a *g);
+                void (*dump_wpr_info)(struct gk20a *g);
                 int (*vpr_info_fetch)(struct gk20a *g);
                 void (*read_wpr_info)(struct gk20a *g,
                                 struct wpr_carveout_info *inf);
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_fb_gp106.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_fb_gp106.h
index df60beca..1c2a1ac6 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_fb_gp106.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_fb_gp106.h
@@ -448,22 +448,6 @@ static inline u32 fb_mmu_debug_ctrl_debug_disabled_f(void)
 {
         return 0x0U;
 }
-static inline u32 fb_mmu_vpr_info_r(void)
-{
-        return 0x00100cd0U;
-}
-static inline u32 fb_mmu_vpr_info_fetch_v(u32 r)
-{
-        return (r >> 2U) & 0x1U;
-}
-static inline u32 fb_mmu_vpr_info_fetch_false_v(void)
-{
-        return 0x00000000U;
-}
-static inline u32 fb_mmu_vpr_info_fetch_true_v(void)
-{
-        return 0x00000001U;
-}
 static inline u32 fb_mmu_priv_level_mask_r(void)
 {
         return 0x00100cdcU;
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_fb_gv100.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_fb_gv100.h
index 80ff5dc2..66727b94 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_fb_gv100.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_fb_gv100.h
@@ -680,58 +680,6 @@ static inline u32 fb_mmu_debug_ctrl_debug_disabled_v(void)
 {
         return 0x00000000U;
 }
-static inline u32 fb_mmu_vpr_info_r(void)
-{
-        return 0x00100cd0U;
-}
-static inline u32 fb_mmu_vpr_info_index_f(u32 v)
-{
-        return (v & 0x3U) << 0U;
-}
-static inline u32 fb_mmu_vpr_info_index_v(u32 r)
-{
-        return (r >> 0U) & 0x3U;
-}
-static inline u32 fb_mmu_vpr_info_index_m(void)
-{
-        return 0x3U << 0U;
-}
-static inline u32 fb_mmu_vpr_info_index_addr_lo_v(void)
-{
-        return 0x00000000U;
-}
-static inline u32 fb_mmu_vpr_info_index_addr_hi_v(void)
-{
-        return 0x00000001U;
-}
-static inline u32 fb_mmu_vpr_info_index_cya_lo_v(void)
-{
-        return 0x00000002U;
-}
-static inline u32 fb_mmu_vpr_info_index_cya_hi_v(void)
-{
-        return 0x00000003U;
-}
-static inline u32 fb_mmu_vpr_info_cya_lo_in_use_m(void)
-{
-        return 0x1U << 4U;
-}
-static inline u32 fb_mmu_vpr_info_fetch_f(u32 v)
-{
-        return (v & 0x1U) << 2U;
-}
-static inline u32 fb_mmu_vpr_info_fetch_v(u32 r)
-{
-        return (r >> 2U) & 0x1U;
-}
-static inline u32 fb_mmu_vpr_info_fetch_false_v(void)
-{
-        return 0x00000000U;
-}
-static inline u32 fb_mmu_vpr_info_fetch_true_v(void)
-{
-        return 0x00000001U;
-}
 static inline u32 fb_niso_cfg1_r(void)
 {
         return 0x00100c14U;