diff options
Diffstat (limited to 'drivers/gpu/nvgpu/include')
-rw-r--r-- | drivers/gpu/nvgpu/include/nvgpu/gk20a.h | 3 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_fb_gp106.h | 16 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_fb_gv100.h | 52 |
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 { | |||
549 | */ | 549 | */ |
550 | u32 (*compression_align_mask)(struct gk20a *g); | 550 | u32 (*compression_align_mask)(struct gk20a *g); |
551 | 551 | ||
552 | void (*dump_vpr_wpr_info)(struct gk20a *g); | 552 | void (*dump_vpr_info)(struct gk20a *g); |
553 | void (*dump_wpr_info)(struct gk20a *g); | ||
553 | int (*vpr_info_fetch)(struct gk20a *g); | 554 | int (*vpr_info_fetch)(struct gk20a *g); |
554 | void (*read_wpr_info)(struct gk20a *g, | 555 | void (*read_wpr_info)(struct gk20a *g, |
555 | struct wpr_carveout_info *inf); | 556 | 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) | |||
448 | { | 448 | { |
449 | return 0x0U; | 449 | return 0x0U; |
450 | } | 450 | } |
451 | static inline u32 fb_mmu_vpr_info_r(void) | ||
452 | { | ||
453 | return 0x00100cd0U; | ||
454 | } | ||
455 | static inline u32 fb_mmu_vpr_info_fetch_v(u32 r) | ||
456 | { | ||
457 | return (r >> 2U) & 0x1U; | ||
458 | } | ||
459 | static inline u32 fb_mmu_vpr_info_fetch_false_v(void) | ||
460 | { | ||
461 | return 0x00000000U; | ||
462 | } | ||
463 | static inline u32 fb_mmu_vpr_info_fetch_true_v(void) | ||
464 | { | ||
465 | return 0x00000001U; | ||
466 | } | ||
467 | static inline u32 fb_mmu_priv_level_mask_r(void) | 451 | static inline u32 fb_mmu_priv_level_mask_r(void) |
468 | { | 452 | { |
469 | return 0x00100cdcU; | 453 | 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) | |||
680 | { | 680 | { |
681 | return 0x00000000U; | 681 | return 0x00000000U; |
682 | } | 682 | } |
683 | static inline u32 fb_mmu_vpr_info_r(void) | ||
684 | { | ||
685 | return 0x00100cd0U; | ||
686 | } | ||
687 | static inline u32 fb_mmu_vpr_info_index_f(u32 v) | ||
688 | { | ||
689 | return (v & 0x3U) << 0U; | ||
690 | } | ||
691 | static inline u32 fb_mmu_vpr_info_index_v(u32 r) | ||
692 | { | ||
693 | return (r >> 0U) & 0x3U; | ||
694 | } | ||
695 | static inline u32 fb_mmu_vpr_info_index_m(void) | ||
696 | { | ||
697 | return 0x3U << 0U; | ||
698 | } | ||
699 | static inline u32 fb_mmu_vpr_info_index_addr_lo_v(void) | ||
700 | { | ||
701 | return 0x00000000U; | ||
702 | } | ||
703 | static inline u32 fb_mmu_vpr_info_index_addr_hi_v(void) | ||
704 | { | ||
705 | return 0x00000001U; | ||
706 | } | ||
707 | static inline u32 fb_mmu_vpr_info_index_cya_lo_v(void) | ||
708 | { | ||
709 | return 0x00000002U; | ||
710 | } | ||
711 | static inline u32 fb_mmu_vpr_info_index_cya_hi_v(void) | ||
712 | { | ||
713 | return 0x00000003U; | ||
714 | } | ||
715 | static inline u32 fb_mmu_vpr_info_cya_lo_in_use_m(void) | ||
716 | { | ||
717 | return 0x1U << 4U; | ||
718 | } | ||
719 | static inline u32 fb_mmu_vpr_info_fetch_f(u32 v) | ||
720 | { | ||
721 | return (v & 0x1U) << 2U; | ||
722 | } | ||
723 | static inline u32 fb_mmu_vpr_info_fetch_v(u32 r) | ||
724 | { | ||
725 | return (r >> 2U) & 0x1U; | ||
726 | } | ||
727 | static inline u32 fb_mmu_vpr_info_fetch_false_v(void) | ||
728 | { | ||
729 | return 0x00000000U; | ||
730 | } | ||
731 | static inline u32 fb_mmu_vpr_info_fetch_true_v(void) | ||
732 | { | ||
733 | return 0x00000001U; | ||
734 | } | ||
735 | static inline u32 fb_niso_cfg1_r(void) | 683 | static inline u32 fb_niso_cfg1_r(void) |
736 | { | 684 | { |
737 | return 0x00100c14U; | 685 | return 0x00100c14U; |