diff options
Diffstat (limited to 'drivers/gpu/nvgpu/common/linux/vgpu/vgpu_linux.c')
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/vgpu/vgpu_linux.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/drivers/gpu/nvgpu/common/linux/vgpu/vgpu_linux.c b/drivers/gpu/nvgpu/common/linux/vgpu/vgpu_linux.c index c3d95b4a..5d3598b5 100644 --- a/drivers/gpu/nvgpu/common/linux/vgpu/vgpu_linux.c +++ b/drivers/gpu/nvgpu/common/linux/vgpu/vgpu_linux.c | |||
@@ -142,7 +142,7 @@ int vgpu_pm_prepare_poweroff(struct device *dev) | |||
142 | struct gk20a *g = get_gk20a(dev); | 142 | struct gk20a *g = get_gk20a(dev); |
143 | int ret = 0; | 143 | int ret = 0; |
144 | 144 | ||
145 | gk20a_dbg_fn(""); | 145 | nvgpu_log_fn(g, " "); |
146 | 146 | ||
147 | if (!g->power_on) | 147 | if (!g->power_on) |
148 | return 0; | 148 | return 0; |
@@ -162,7 +162,7 @@ int vgpu_pm_finalize_poweron(struct device *dev) | |||
162 | struct nvgpu_os_linux *l = nvgpu_os_linux_from_gk20a(g); | 162 | struct nvgpu_os_linux *l = nvgpu_os_linux_from_gk20a(g); |
163 | int err; | 163 | int err; |
164 | 164 | ||
165 | gk20a_dbg_fn(""); | 165 | nvgpu_log_fn(g, " "); |
166 | 166 | ||
167 | if (g->power_on) | 167 | if (g->power_on) |
168 | return 0; | 168 | return 0; |
@@ -227,7 +227,7 @@ static int vgpu_qos_notify(struct notifier_block *nb, | |||
227 | u32 max_freq; | 227 | u32 max_freq; |
228 | int err; | 228 | int err; |
229 | 229 | ||
230 | gk20a_dbg_fn(""); | 230 | nvgpu_log_fn(g, " "); |
231 | 231 | ||
232 | max_freq = (u32)pm_qos_read_max_bound(PM_QOS_GPU_FREQ_BOUNDS); | 232 | max_freq = (u32)pm_qos_read_max_bound(PM_QOS_GPU_FREQ_BOUNDS); |
233 | err = vgpu_clk_cap_rate(profile->dev, max_freq); | 233 | err = vgpu_clk_cap_rate(profile->dev, max_freq); |
@@ -277,7 +277,7 @@ static int vgpu_pm_init(struct device *dev) | |||
277 | int num_freqs; | 277 | int num_freqs; |
278 | int err = 0; | 278 | int err = 0; |
279 | 279 | ||
280 | gk20a_dbg_fn(""); | 280 | nvgpu_log_fn(g, " "); |
281 | 281 | ||
282 | if (nvgpu_platform_is_simulation(g)) | 282 | if (nvgpu_platform_is_simulation(g)) |
283 | return 0; | 283 | return 0; |
@@ -321,14 +321,15 @@ int vgpu_probe(struct platform_device *pdev) | |||
321 | return -ENODATA; | 321 | return -ENODATA; |
322 | } | 322 | } |
323 | 323 | ||
324 | gk20a_dbg_fn(""); | ||
325 | |||
326 | l = kzalloc(sizeof(*l), GFP_KERNEL); | 324 | l = kzalloc(sizeof(*l), GFP_KERNEL); |
327 | if (!l) { | 325 | if (!l) { |
328 | dev_err(dev, "couldn't allocate gk20a support"); | 326 | dev_err(dev, "couldn't allocate gk20a support"); |
329 | return -ENOMEM; | 327 | return -ENOMEM; |
330 | } | 328 | } |
331 | gk20a = &l->g; | 329 | gk20a = &l->g; |
330 | |||
331 | nvgpu_log_fn(gk20a, " "); | ||
332 | |||
332 | nvgpu_init_gk20a(gk20a); | 333 | nvgpu_init_gk20a(gk20a); |
333 | 334 | ||
334 | nvgpu_kmem_init(gk20a); | 335 | nvgpu_kmem_init(gk20a); |
@@ -428,7 +429,7 @@ int vgpu_probe(struct platform_device *pdev) | |||
428 | vgpu_create_sysfs(dev); | 429 | vgpu_create_sysfs(dev); |
429 | gk20a_init_gr(gk20a); | 430 | gk20a_init_gr(gk20a); |
430 | 431 | ||
431 | gk20a_dbg_info("total ram pages : %lu", totalram_pages); | 432 | nvgpu_log_info(gk20a, "total ram pages : %lu", totalram_pages); |
432 | gk20a->gr.max_comptag_mem = totalram_pages | 433 | gk20a->gr.max_comptag_mem = totalram_pages |
433 | >> (10 - (PAGE_SHIFT - 10)); | 434 | >> (10 - (PAGE_SHIFT - 10)); |
434 | 435 | ||
@@ -442,7 +443,7 @@ int vgpu_remove(struct platform_device *pdev) | |||
442 | struct device *dev = &pdev->dev; | 443 | struct device *dev = &pdev->dev; |
443 | struct gk20a *g = get_gk20a(dev); | 444 | struct gk20a *g = get_gk20a(dev); |
444 | 445 | ||
445 | gk20a_dbg_fn(""); | 446 | nvgpu_log_fn(g, " "); |
446 | 447 | ||
447 | vgpu_pm_qos_remove(dev); | 448 | vgpu_pm_qos_remove(dev); |
448 | if (g->remove_support) | 449 | if (g->remove_support) |