From dd739fcb039d51606e9a5454ec0aab17bcb01965 Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Wed, 18 Apr 2018 19:39:46 -0700 Subject: 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 Reviewed-on: https://git-master.nvidia.com/r/1704148 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/common/linux/nvgpu_mem.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'drivers/gpu/nvgpu/common/linux/nvgpu_mem.c') diff --git a/drivers/gpu/nvgpu/common/linux/nvgpu_mem.c b/drivers/gpu/nvgpu/common/linux/nvgpu_mem.c index 3cac13ba..015295ba 100644 --- a/drivers/gpu/nvgpu/common/linux/nvgpu_mem.c +++ b/drivers/gpu/nvgpu/common/linux/nvgpu_mem.c @@ -140,7 +140,7 @@ u32 nvgpu_mem_rd32(struct gk20a *g, struct nvgpu_mem *mem, u32 w) WARN_ON(!ptr); data = ptr[w]; #ifdef CONFIG_TEGRA_SIMULATION_PLATFORM - gk20a_dbg(gpu_dbg_mem, " %p = 0x%x", ptr + w, data); + nvgpu_log(g, gpu_dbg_mem, " %p = 0x%x", ptr + w, data); #endif } else if (mem->aperture == APERTURE_VIDMEM || g->mm.force_pramin) { u32 value; @@ -177,7 +177,7 @@ void nvgpu_mem_rd_n(struct gk20a *g, struct nvgpu_mem *mem, memcpy(dest, src, size); #ifdef CONFIG_TEGRA_SIMULATION_PLATFORM if (size) - gk20a_dbg(gpu_dbg_mem, " %p = 0x%x ... [%d bytes]", + nvgpu_log(g, gpu_dbg_mem, " %p = 0x%x ... [%d bytes]", src, *dest, size); #endif } else if (mem->aperture == APERTURE_VIDMEM || g->mm.force_pramin) { @@ -215,7 +215,7 @@ void nvgpu_mem_wr32(struct gk20a *g, struct nvgpu_mem *mem, u32 w, u32 data) WARN_ON(!ptr); #ifdef CONFIG_TEGRA_SIMULATION_PLATFORM - gk20a_dbg(gpu_dbg_mem, " %p = 0x%x", ptr + w, data); + nvgpu_log(g, gpu_dbg_mem, " %p = 0x%x", ptr + w, data); #endif ptr[w] = data; } else if (mem->aperture == APERTURE_VIDMEM || g->mm.force_pramin) { @@ -249,7 +249,7 @@ void nvgpu_mem_wr_n(struct gk20a *g, struct nvgpu_mem *mem, u32 offset, WARN_ON(!mem->cpu_va); #ifdef CONFIG_TEGRA_SIMULATION_PLATFORM if (size) - gk20a_dbg(gpu_dbg_mem, " %p = 0x%x ... [%d bytes]", + nvgpu_log(g, gpu_dbg_mem, " %p = 0x%x ... [%d bytes]", dest, *src, size); #endif memcpy(dest, src, size); @@ -296,7 +296,7 @@ void nvgpu_memset(struct gk20a *g, struct nvgpu_mem *mem, u32 offset, WARN_ON(!mem->cpu_va); #ifdef CONFIG_TEGRA_SIMULATION_PLATFORM if (size) - gk20a_dbg(gpu_dbg_mem, " %p = 0x%x [times %d]", + nvgpu_log(g, gpu_dbg_mem, " %p = 0x%x [times %d]", dest, c, size); #endif memset(dest, c, size); -- cgit v1.2.2