summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTerje Bergstrom <tbergstrom@nvidia.com>2018-08-16 16:56:42 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2018-08-28 00:44:34 -0400
commit271456272d09d6c21728cc92bedc8ec6f7f48c8b (patch)
tree36c4031a529062741152ac80433662d54078b7c5
parentdd71ad91b941d0159ae7758e2a3dd6627d7c7da2 (diff)
gpu: nvgpu: Use FB reg for getting HUB MMU dbg mode
When we program MMU debug mode, we program it to both HUB and GPC MMU. The query retrieved the value from GPC MMU, which introduces a dependency from FB to GR. Change the code to retrieve the mode from HUB MMU instead. Change-Id: I6fa98e050480f7405395b7e44965defa386734d4 Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com> Reviewed-on: https://git-master.nvidia.com/r/1801419 Reviewed-by: svc-misra-checker <svc-misra-checker@nvidia.com> GVS: Gerrit_Virtual_Submit Reviewed-by: Konsta Holtta <kholtta@nvidia.com> Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
-rw-r--r--drivers/gpu/nvgpu/common/fb/fb_gm20b.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/nvgpu/common/fb/fb_gm20b.c b/drivers/gpu/nvgpu/common/fb/fb_gm20b.c
index 36ec21b1..5e78f636 100644
--- a/drivers/gpu/nvgpu/common/fb/fb_gm20b.c
+++ b/drivers/gpu/nvgpu/common/fb/fb_gm20b.c
@@ -202,9 +202,9 @@ void gm20b_fb_read_wpr_info(struct gk20a *g, struct wpr_carveout_info *inf)
202 202
203bool gm20b_fb_debug_mode_enabled(struct gk20a *g) 203bool gm20b_fb_debug_mode_enabled(struct gk20a *g)
204{ 204{
205 u32 debug_ctrl = gk20a_readl(g, gr_gpcs_pri_mmu_debug_ctrl_r()); 205 u32 debug_ctrl = gk20a_readl(g, fb_mmu_debug_ctrl_r());
206 return gr_gpcs_pri_mmu_debug_ctrl_debug_v(debug_ctrl) == 206 return fb_mmu_debug_ctrl_debug_v(debug_ctrl) ==
207 gr_gpcs_pri_mmu_debug_ctrl_debug_enabled_v(); 207 fb_mmu_debug_ctrl_debug_enabled_v();
208} 208}
209 209
210void gm20b_fb_set_debug_mode(struct gk20a *g, bool enable) 210void gm20b_fb_set_debug_mode(struct gk20a *g, bool enable)