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/pmgr/pwrmonitor.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/pmgr/pwrmonitor.c')
-rw-r--r-- | drivers/gpu/nvgpu/pmgr/pwrmonitor.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/gpu/nvgpu/pmgr/pwrmonitor.c b/drivers/gpu/nvgpu/pmgr/pwrmonitor.c index 00c930a6..5e0cc966 100644 --- a/drivers/gpu/nvgpu/pmgr/pwrmonitor.c +++ b/drivers/gpu/nvgpu/pmgr/pwrmonitor.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved. | 2 | * Copyright (c) 2016-2018, NVIDIA CORPORATION. All rights reserved. |
3 | * | 3 | * |
4 | * Permission is hereby granted, free of charge, to any person obtaining a | 4 | * Permission is hereby granted, free of charge, to any person obtaining a |
5 | * copy of this software and associated documentation files (the "Software"), | 5 | * copy of this software and associated documentation files (the "Software"), |
@@ -36,7 +36,7 @@ static u32 _pwr_channel_pmudata_instget(struct gk20a *g, | |||
36 | struct nv_pmu_pmgr_pwr_channel_desc *ppmgrchannel = | 36 | struct nv_pmu_pmgr_pwr_channel_desc *ppmgrchannel = |
37 | (struct nv_pmu_pmgr_pwr_channel_desc *)pmuboardobjgrp; | 37 | (struct nv_pmu_pmgr_pwr_channel_desc *)pmuboardobjgrp; |
38 | 38 | ||
39 | gk20a_dbg_info(""); | 39 | nvgpu_log_info(g, " "); |
40 | 40 | ||
41 | /*check whether pmuboardobjgrp has a valid boardobj in index*/ | 41 | /*check whether pmuboardobjgrp has a valid boardobj in index*/ |
42 | if (((u32)BIT(idx) & | 42 | if (((u32)BIT(idx) & |
@@ -49,7 +49,7 @@ static u32 _pwr_channel_pmudata_instget(struct gk20a *g, | |||
49 | /* handle Global/common data here as we need index */ | 49 | /* handle Global/common data here as we need index */ |
50 | ppmgrchannel->channels[idx].data.pwr_channel.ch_idx = idx; | 50 | ppmgrchannel->channels[idx].data.pwr_channel.ch_idx = idx; |
51 | 51 | ||
52 | gk20a_dbg_info(" Done"); | 52 | nvgpu_log_info(g, " Done"); |
53 | 53 | ||
54 | return 0; | 54 | return 0; |
55 | } | 55 | } |
@@ -62,7 +62,7 @@ static u32 _pwr_channel_rels_pmudata_instget(struct gk20a *g, | |||
62 | struct nv_pmu_pmgr_pwr_chrelationship_desc *ppmgrchrels = | 62 | struct nv_pmu_pmgr_pwr_chrelationship_desc *ppmgrchrels = |
63 | (struct nv_pmu_pmgr_pwr_chrelationship_desc *)pmuboardobjgrp; | 63 | (struct nv_pmu_pmgr_pwr_chrelationship_desc *)pmuboardobjgrp; |
64 | 64 | ||
65 | gk20a_dbg_info(""); | 65 | nvgpu_log_info(g, " "); |
66 | 66 | ||
67 | /*check whether pmuboardobjgrp has a valid boardobj in index*/ | 67 | /*check whether pmuboardobjgrp has a valid boardobj in index*/ |
68 | if (((u32)BIT(idx) & | 68 | if (((u32)BIT(idx) & |
@@ -72,7 +72,7 @@ static u32 _pwr_channel_rels_pmudata_instget(struct gk20a *g, | |||
72 | *ppboardobjpmudata = (struct nv_pmu_boardobj *) | 72 | *ppboardobjpmudata = (struct nv_pmu_boardobj *) |
73 | &ppmgrchrels->ch_rels[idx].data.board_obj; | 73 | &ppmgrchrels->ch_rels[idx].data.board_obj; |
74 | 74 | ||
75 | gk20a_dbg_info(" Done"); | 75 | nvgpu_log_info(g, " Done"); |
76 | 76 | ||
77 | return 0; | 77 | return 0; |
78 | } | 78 | } |
@@ -169,7 +169,7 @@ static struct boardobj *construct_pwr_topology(struct gk20a *g, | |||
169 | pwrchannel->pwr_dev_idx = sensor->pwr_dev_idx; | 169 | pwrchannel->pwr_dev_idx = sensor->pwr_dev_idx; |
170 | pwrchannel->pwr_dev_prov_idx = sensor->pwr_dev_prov_idx; | 170 | pwrchannel->pwr_dev_prov_idx = sensor->pwr_dev_prov_idx; |
171 | 171 | ||
172 | gk20a_dbg_info(" Done"); | 172 | nvgpu_log_info(g, " Done"); |
173 | 173 | ||
174 | return board_obj_ptr; | 174 | return board_obj_ptr; |
175 | } | 175 | } |
@@ -192,7 +192,7 @@ static u32 devinit_get_pwr_topology_table(struct gk20a *g, | |||
192 | struct pwr_channel_sensor sensor; | 192 | struct pwr_channel_sensor sensor; |
193 | } pwr_topology_data; | 193 | } pwr_topology_data; |
194 | 194 | ||
195 | gk20a_dbg_info(""); | 195 | nvgpu_log_info(g, " "); |
196 | 196 | ||
197 | pwr_topology_table_ptr = (u8 *)nvgpu_bios_get_perf_table_ptrs(g, | 197 | pwr_topology_table_ptr = (u8 *)nvgpu_bios_get_perf_table_ptrs(g, |
198 | g->bios.perf_token, POWER_TOPOLOGY_TABLE); | 198 | g->bios.perf_token, POWER_TOPOLOGY_TABLE); |
@@ -292,7 +292,7 @@ static u32 devinit_get_pwr_topology_table(struct gk20a *g, | |||
292 | } | 292 | } |
293 | 293 | ||
294 | done: | 294 | done: |
295 | gk20a_dbg_info(" done status %x", status); | 295 | nvgpu_log_info(g, " done status %x", status); |
296 | return status; | 296 | return status; |
297 | } | 297 | } |
298 | 298 | ||
@@ -365,6 +365,6 @@ u32 pmgr_monitor_sw_setup(struct gk20a *g) | |||
365 | } | 365 | } |
366 | 366 | ||
367 | done: | 367 | done: |
368 | gk20a_dbg_info(" done status %x", status); | 368 | nvgpu_log_info(g, " done status %x", status); |
369 | return status; | 369 | return status; |
370 | } | 370 | } |