summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gp106/bios_gp106.c
diff options
context:
space:
mode:
authorTerje Bergstrom <tbergstrom@nvidia.com>2018-04-18 22:39:46 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2018-05-09 21:26:04 -0400
commitdd739fcb039d51606e9a5454ec0aab17bcb01965 (patch)
tree806ba8575d146367ad1be00086ca0cdae35a6b28 /drivers/gpu/nvgpu/gp106/bios_gp106.c
parent7e66f2a63d4855e763fa768047dfc32f6f96b771 (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/gp106/bios_gp106.c')
-rw-r--r--drivers/gpu/nvgpu/gp106/bios_gp106.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/gpu/nvgpu/gp106/bios_gp106.c b/drivers/gpu/nvgpu/gp106/bios_gp106.c
index 8511d3c2..3363aeba 100644
--- a/drivers/gpu/nvgpu/gp106/bios_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/bios_gp106.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (c) 2015-2017, NVIDIA CORPORATION. All rights reserved. 2 * Copyright (c) 2015-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"),
@@ -56,13 +56,13 @@ static void upload_data(struct gk20a *g, u32 dst, u8 *src, u32 size, u8 port)
56 u32 *src_u32 = (u32 *)src; 56 u32 *src_u32 = (u32 *)src;
57 u32 blk; 57 u32 blk;
58 58
59 gk20a_dbg_info("upload %d bytes to %x", size, dst); 59 nvgpu_log_info(g, "upload %d bytes to %x", size, dst);
60 60
61 words = DIV_ROUND_UP(size, 4); 61 words = DIV_ROUND_UP(size, 4);
62 62
63 blk = dst >> 8; 63 blk = dst >> 8;
64 64
65 gk20a_dbg_info("upload %d words to %x blk %d", 65 nvgpu_log_info(g, "upload %d words to %x blk %d",
66 words, dst, blk); 66 words, dst, blk);
67 gk20a_writel(g, pwr_falcon_dmemc_r(port), 67 gk20a_writel(g, pwr_falcon_dmemc_r(port),
68 pwr_falcon_dmemc_offs_f(dst >> 2) | 68 pwr_falcon_dmemc_offs_f(dst >> 2) |
@@ -79,7 +79,7 @@ static int gp106_bios_devinit(struct gk20a *g)
79 int devinit_completed; 79 int devinit_completed;
80 struct nvgpu_timeout timeout; 80 struct nvgpu_timeout timeout;
81 81
82 gk20a_dbg_fn(""); 82 nvgpu_log_fn(g, " ");
83 83
84 if (nvgpu_flcn_reset(g->pmu.flcn)) { 84 if (nvgpu_flcn_reset(g->pmu.flcn)) {
85 err = -ETIMEDOUT; 85 err = -ETIMEDOUT;
@@ -128,7 +128,7 @@ static int gp106_bios_devinit(struct gk20a *g)
128 gk20a_get_gr_idle_timeout(g)); 128 gk20a_get_gr_idle_timeout(g));
129 129
130out: 130out:
131 gk20a_dbg_fn("done"); 131 nvgpu_log_fn(g, "done");
132 return err; 132 return err;
133} 133}
134 134
@@ -146,7 +146,7 @@ static int gp106_bios_preos(struct gk20a *g)
146{ 146{
147 int err = 0; 147 int err = 0;
148 148
149 gk20a_dbg_fn(""); 149 nvgpu_log_fn(g, " ");
150 150
151 if (nvgpu_flcn_reset(g->pmu.flcn)) { 151 if (nvgpu_flcn_reset(g->pmu.flcn)) {
152 err = -ETIMEDOUT; 152 err = -ETIMEDOUT;
@@ -177,7 +177,7 @@ static int gp106_bios_preos(struct gk20a *g)
177 gk20a_get_gr_idle_timeout(g)); 177 gk20a_get_gr_idle_timeout(g));
178 178
179out: 179out:
180 gk20a_dbg_fn("done"); 180 nvgpu_log_fn(g, "done");
181 return err; 181 return err;
182} 182}
183 183
@@ -186,12 +186,12 @@ int gp106_bios_init(struct gk20a *g)
186 unsigned int i; 186 unsigned int i;
187 int err; 187 int err;
188 188
189 gk20a_dbg_fn(""); 189 nvgpu_log_fn(g, " ");
190 190
191 if (g->bios_is_init) 191 if (g->bios_is_init)
192 return 0; 192 return 0;
193 193
194 gk20a_dbg_info("reading bios from EEPROM"); 194 nvgpu_log_info(g, "reading bios from EEPROM");
195 g->bios.size = BIOS_SIZE; 195 g->bios.size = BIOS_SIZE;
196 g->bios.data = nvgpu_vmalloc(g, BIOS_SIZE); 196 g->bios.data = nvgpu_vmalloc(g, BIOS_SIZE);
197 if (!g->bios.data) 197 if (!g->bios.data)
@@ -218,7 +218,7 @@ int gp106_bios_init(struct gk20a *g)
218 goto free_firmware; 218 goto free_firmware;
219 } 219 }
220 220
221 gk20a_dbg_fn("done"); 221 nvgpu_log_fn(g, "done");
222 222
223 err = gp106_bios_devinit(g); 223 err = gp106_bios_devinit(g);
224 if (err) { 224 if (err) {