diff options
author | Aparna Das <aparnad@nvidia.com> | 2020-01-31 15:34:07 -0500 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2020-02-05 06:25:01 -0500 |
commit | 63e9d8eb9ad80724f2567aaa7c05cb2c7acfd4b1 (patch) | |
tree | a66df8619d3faa42f1f8d106a401fc34824953ad /drivers/gpu/nvgpu/vgpu/gv11b | |
parent | e41fd090315ff37fa09314a8cfde6d384385e17a (diff) |
gpu: nvgpu: vgpu: add mmu_debug_mode support
Added two new IVC commands that set gr and fb mmu debug mode.
Bug 2586624
Change-Id: I358fb04713a9754fb209c0a90d02130dd4a1caf6
Reviewed-on: https://git-master.nvidia.com/r/2204980
(cherry picked from commit db4e5b09891aff075dfffb7cc2fe0630a71ab9a6)
Signed-off-by: Aparna Das <aparnad@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2288347
Reviewed-by: Kajetan Dutka <kdutka@nvidia.com>
Reviewed-by: Yu-Huan Hsu <yhsu@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
GVS: Gerrit_Virtual_Submit
Tested-by: Kajetan Dutka <kdutka@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/vgpu/gv11b')
-rw-r--r-- | drivers/gpu/nvgpu/vgpu/gv11b/vgpu_gv11b.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_gv11b.c b/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_gv11b.c index 2190478e..a6c11719 100644 --- a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_gv11b.c +++ b/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_gv11b.c | |||
@@ -44,7 +44,7 @@ int vgpu_gv11b_init_gpu_characteristics(struct gk20a *g) | |||
44 | __nvgpu_set_enabled(g, NVGPU_SUPPORT_SYNCPOINT_ADDRESS, true); | 44 | __nvgpu_set_enabled(g, NVGPU_SUPPORT_SYNCPOINT_ADDRESS, true); |
45 | __nvgpu_set_enabled(g, NVGPU_SUPPORT_USER_SYNCPOINT, true); | 45 | __nvgpu_set_enabled(g, NVGPU_SUPPORT_USER_SYNCPOINT, true); |
46 | __nvgpu_set_enabled(g, NVGPU_SUPPORT_PLATFORM_ATOMIC, true); | 46 | __nvgpu_set_enabled(g, NVGPU_SUPPORT_PLATFORM_ATOMIC, true); |
47 | __nvgpu_set_enabled(g, NVGPU_SUPPORT_SET_CTX_MMU_DEBUG_MODE, false); | 47 | __nvgpu_set_enabled(g, NVGPU_SUPPORT_SET_CTX_MMU_DEBUG_MODE, true); |
48 | 48 | ||
49 | return 0; | 49 | return 0; |
50 | } | 50 | } |
diff --git a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c b/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c index f51d4c35..cfd4e385 100644 --- a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c +++ b/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c | |||
@@ -49,6 +49,7 @@ | |||
49 | #include "vgpu/dbg_vgpu.h" | 49 | #include "vgpu/dbg_vgpu.h" |
50 | #include "vgpu/fecs_trace_vgpu.h" | 50 | #include "vgpu/fecs_trace_vgpu.h" |
51 | #include "vgpu/css_vgpu.h" | 51 | #include "vgpu/css_vgpu.h" |
52 | #include "vgpu/fb_vgpu.h" | ||
52 | #include "vgpu/gm20b/vgpu_gr_gm20b.h" | 53 | #include "vgpu/gm20b/vgpu_gr_gm20b.h" |
53 | #include "vgpu/gp10b/vgpu_mm_gp10b.h" | 54 | #include "vgpu/gp10b/vgpu_mm_gp10b.h" |
54 | #include "vgpu/gp10b/vgpu_gr_gp10b.h" | 55 | #include "vgpu/gp10b/vgpu_gr_gp10b.h" |
@@ -189,7 +190,7 @@ static const struct gpu_ops vgpu_gv11b_ops = { | |||
189 | .get_hw_accessor_stream_out_mode = | 190 | .get_hw_accessor_stream_out_mode = |
190 | gr_gv100_get_hw_accessor_stream_out_mode, | 191 | gr_gv100_get_hw_accessor_stream_out_mode, |
191 | .update_hwpm_ctxsw_mode = vgpu_gr_update_hwpm_ctxsw_mode, | 192 | .update_hwpm_ctxsw_mode = vgpu_gr_update_hwpm_ctxsw_mode, |
192 | .set_mmu_debug_mode = NULL, | 193 | .set_mmu_debug_mode = vgpu_gr_set_mmu_debug_mode, |
193 | .record_sm_error_state = gv11b_gr_record_sm_error_state, | 194 | .record_sm_error_state = gv11b_gr_record_sm_error_state, |
194 | .clear_sm_error_state = vgpu_gr_clear_sm_error_state, | 195 | .clear_sm_error_state = vgpu_gr_clear_sm_error_state, |
195 | .suspend_contexts = vgpu_gr_suspend_contexts, | 196 | .suspend_contexts = vgpu_gr_suspend_contexts, |
@@ -291,7 +292,7 @@ static const struct gpu_ops vgpu_gv11b_ops = { | |||
291 | .read_wpr_info = NULL, | 292 | .read_wpr_info = NULL, |
292 | .is_debug_mode_enabled = NULL, | 293 | .is_debug_mode_enabled = NULL, |
293 | .set_debug_mode = vgpu_mm_mmu_set_debug_mode, | 294 | .set_debug_mode = vgpu_mm_mmu_set_debug_mode, |
294 | .set_mmu_debug_mode = NULL, | 295 | .set_mmu_debug_mode = vgpu_fb_set_mmu_debug_mode, |
295 | .tlb_invalidate = vgpu_mm_tlb_invalidate, | 296 | .tlb_invalidate = vgpu_mm_tlb_invalidate, |
296 | .hub_isr = gv11b_fb_hub_isr, | 297 | .hub_isr = gv11b_fb_hub_isr, |
297 | .enable_hub_intr = gv11b_fb_enable_hub_intr, | 298 | .enable_hub_intr = gv11b_fb_enable_hub_intr, |