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>

1 files changed, 10 insertions, 7 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c b/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c
index ce06e78b..97de7138 100644
--- a/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c
@@ -90,8 +90,9 @@ void gk20a_dbg_gpu_post_events(struct channel_gk20a *ch)
 {
         struct dbg_session_data *session_data;
         struct dbg_session_gk20a *dbg_s;
+        struct gk20a *g = ch->g;
 
-        gk20a_dbg(gpu_dbg_fn | gpu_dbg_gpu_dbg, "");
+        nvgpu_log(g, gpu_dbg_fn | gpu_dbg_gpu_dbg, " ");
 
         /* guard against the session list being modified */
         nvgpu_mutex_acquire(&ch->dbg_s_lock);
@@ -100,9 +101,9 @@ void gk20a_dbg_gpu_post_events(struct channel_gk20a *ch)
                                 dbg_session_data, dbg_s_entry) {
                 dbg_s = session_data->dbg_s;
                 if (dbg_s->dbg_events.events_enabled) {
-                        gk20a_dbg(gpu_dbg_gpu_dbg, "posting event on session id %d",
+                        nvgpu_log(g, gpu_dbg_gpu_dbg, "posting event on session id %d",
                                         dbg_s->id);
-                        gk20a_dbg(gpu_dbg_gpu_dbg, "%d events pending",
+                        nvgpu_log(g, gpu_dbg_gpu_dbg, "%d events pending",
                                         dbg_s->dbg_events.num_pending_events);
 
                         dbg_s->dbg_events.num_pending_events++;
@@ -119,8 +120,9 @@ bool gk20a_dbg_gpu_broadcast_stop_trigger(struct channel_gk20a *ch)
         struct dbg_session_data *session_data;
         struct dbg_session_gk20a *dbg_s;
         bool broadcast = false;
+        struct gk20a *g = ch->g;
 
-        gk20a_dbg(gpu_dbg_fn | gpu_dbg_gpu_dbg | gpu_dbg_intr, "");
+        nvgpu_log(g, gpu_dbg_fn | gpu_dbg_gpu_dbg | gpu_dbg_intr, " ");
 
         /* guard against the session list being modified */
         nvgpu_mutex_acquire(&ch->dbg_s_lock);
@@ -129,7 +131,7 @@ bool gk20a_dbg_gpu_broadcast_stop_trigger(struct channel_gk20a *ch)
                                 dbg_session_data, dbg_s_entry) {
                 dbg_s = session_data->dbg_s;
                 if (dbg_s->broadcast_stop_trigger) {
-                        gk20a_dbg(gpu_dbg_gpu_dbg | gpu_dbg_fn | gpu_dbg_intr,
+                        nvgpu_log(g, gpu_dbg_gpu_dbg | gpu_dbg_fn | gpu_dbg_intr,
                                         "stop trigger broadcast enabled");
                         broadcast = true;
                         break;
@@ -145,8 +147,9 @@ int gk20a_dbg_gpu_clear_broadcast_stop_trigger(struct channel_gk20a *ch)
 {
         struct dbg_session_data *session_data;
         struct dbg_session_gk20a *dbg_s;
+        struct gk20a *g = ch->g;
 
-        gk20a_dbg(gpu_dbg_fn | gpu_dbg_gpu_dbg | gpu_dbg_intr, "");
+        nvgpu_log(g, gpu_dbg_fn | gpu_dbg_gpu_dbg | gpu_dbg_intr, " ");
 
         /* guard against the session list being modified */
         nvgpu_mutex_acquire(&ch->dbg_s_lock);
@@ -155,7 +158,7 @@ int gk20a_dbg_gpu_clear_broadcast_stop_trigger(struct channel_gk20a *ch)
                                 dbg_session_data, dbg_s_entry) {
                 dbg_s = session_data->dbg_s;
                 if (dbg_s->broadcast_stop_trigger) {
-                        gk20a_dbg(gpu_dbg_gpu_dbg | gpu_dbg_fn | gpu_dbg_intr,
+                        nvgpu_log(g, gpu_dbg_gpu_dbg | gpu_dbg_fn | gpu_dbg_intr,
                                         "stop trigger broadcast disabled");
                         dbg_s->broadcast_stop_trigger = false;
                 }