diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2018-04-18 22:39:46 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2018-05-09 21:26:04 -0400 |
commit | dd739fcb039d51606e9a5454ec0aab17bcb01965 (patch) | |
tree | 806ba8575d146367ad1be00086ca0cdae35a6b28 /drivers/gpu/nvgpu/gp10b/rpfb_gp10b.c | |
parent | 7e66f2a63d4855e763fa768047dfc32f6f96b771 (diff) |
gpu: nvgpu: Remove gk20a_dbg* functions
Switch all logging to nvgpu_log*(). gk20a_dbg* macros are
intentionally left there because of use from other repositories.
Because the new functions do not work without a pointer to struct
gk20a, and piping it just for logging is excessive, some log messages
are deleted.
Change-Id: I00e22e75fe4596a330bb0282ab4774b3639ee31e
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1704148
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gp10b/rpfb_gp10b.c')
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/rpfb_gp10b.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/gpu/nvgpu/gp10b/rpfb_gp10b.c b/drivers/gpu/nvgpu/gp10b/rpfb_gp10b.c index 385bebbd..3f089545 100644 --- a/drivers/gpu/nvgpu/gp10b/rpfb_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/rpfb_gp10b.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * GP10B RPFB | 2 | * GP10B RPFB |
3 | * | 3 | * |
4 | * Copyright (c) 2015, NVIDIA CORPORATION. All rights reserved. | 4 | * Copyright (c) 2015-2018, NVIDIA CORPORATION. All rights reserved. |
5 | * | 5 | * |
6 | * Permission is hereby granted, free of charge, to any person obtaining a | 6 | * Permission is hereby granted, free of charge, to any person obtaining a |
7 | * copy of this software and associated documentation files (the "Software"), | 7 | * copy of this software and associated documentation files (the "Software"), |
@@ -42,7 +42,7 @@ int gp10b_replayable_pagefault_buffer_init(struct gk20a *g) | |||
42 | size_t rbfb_size = NV_UVM_FAULT_BUF_SIZE * | 42 | size_t rbfb_size = NV_UVM_FAULT_BUF_SIZE * |
43 | fifo_replay_fault_buffer_size_hw_entries_v(); | 43 | fifo_replay_fault_buffer_size_hw_entries_v(); |
44 | 44 | ||
45 | gk20a_dbg_fn(""); | 45 | nvgpu_log_fn(g, " "); |
46 | 46 | ||
47 | if (!g->mm.bar2_desc.gpu_va) { | 47 | if (!g->mm.bar2_desc.gpu_va) { |
48 | err = nvgpu_dma_alloc_map_sys(vm, rbfb_size, | 48 | err = nvgpu_dma_alloc_map_sys(vm, rbfb_size, |
@@ -60,7 +60,7 @@ int gp10b_replayable_pagefault_buffer_init(struct gk20a *g) | |||
60 | gk20a_writel(g, fifo_replay_fault_buffer_lo_r(), | 60 | gk20a_writel(g, fifo_replay_fault_buffer_lo_r(), |
61 | fifo_replay_fault_buffer_lo_base_f(addr_lo) | | 61 | fifo_replay_fault_buffer_lo_base_f(addr_lo) | |
62 | fifo_replay_fault_buffer_lo_enable_true_v()); | 62 | fifo_replay_fault_buffer_lo_enable_true_v()); |
63 | gk20a_dbg_fn("done"); | 63 | nvgpu_log_fn(g, "done"); |
64 | return 0; | 64 | return 0; |
65 | } | 65 | } |
66 | 66 | ||
@@ -75,14 +75,14 @@ u32 gp10b_replayable_pagefault_buffer_get_index(struct gk20a *g) | |||
75 | { | 75 | { |
76 | u32 get_idx = 0; | 76 | u32 get_idx = 0; |
77 | 77 | ||
78 | gk20a_dbg_fn(""); | 78 | nvgpu_log_fn(g, " "); |
79 | 79 | ||
80 | get_idx = gk20a_readl(g, fifo_replay_fault_buffer_get_r()); | 80 | get_idx = gk20a_readl(g, fifo_replay_fault_buffer_get_r()); |
81 | 81 | ||
82 | if (get_idx >= fifo_replay_fault_buffer_size_hw_entries_v()) | 82 | if (get_idx >= fifo_replay_fault_buffer_size_hw_entries_v()) |
83 | nvgpu_err(g, "Error in replayable fault buffer"); | 83 | nvgpu_err(g, "Error in replayable fault buffer"); |
84 | 84 | ||
85 | gk20a_dbg_fn("done"); | 85 | nvgpu_log_fn(g, "done"); |
86 | return get_idx; | 86 | return get_idx; |
87 | } | 87 | } |
88 | 88 | ||
@@ -90,13 +90,13 @@ u32 gp10b_replayable_pagefault_buffer_put_index(struct gk20a *g) | |||
90 | { | 90 | { |
91 | u32 put_idx = 0; | 91 | u32 put_idx = 0; |
92 | 92 | ||
93 | gk20a_dbg_fn(""); | 93 | nvgpu_log_fn(g, " "); |
94 | put_idx = gk20a_readl(g, fifo_replay_fault_buffer_put_r()); | 94 | put_idx = gk20a_readl(g, fifo_replay_fault_buffer_put_r()); |
95 | 95 | ||
96 | if (put_idx >= fifo_replay_fault_buffer_size_hw_entries_v()) | 96 | if (put_idx >= fifo_replay_fault_buffer_size_hw_entries_v()) |
97 | nvgpu_err(g, "Error in UVM"); | 97 | nvgpu_err(g, "Error in UVM"); |
98 | 98 | ||
99 | gk20a_dbg_fn("done"); | 99 | nvgpu_log_fn(g, "done"); |
100 | return put_idx; | 100 | return put_idx; |
101 | } | 101 | } |
102 | 102 | ||