diff options
Diffstat (limited to 'drivers')
22 files changed, 71 insertions, 72 deletions
diff --git a/drivers/gpu/nvgpu/clk/clk_arb.c b/drivers/gpu/nvgpu/clk/clk_arb.c index 9c954deb..0ccc7c53 100644 --- a/drivers/gpu/nvgpu/clk/clk_arb.c +++ b/drivers/gpu/nvgpu/clk/clk_arb.c | |||
@@ -514,7 +514,7 @@ static int nvgpu_clk_arb_install_fd(struct gk20a *g, | |||
514 | goto fail; | 514 | goto fail; |
515 | } | 515 | } |
516 | 516 | ||
517 | snprintf(name, sizeof(name), "%s-clk-fd%d", dev_name(g->dev), fd); | 517 | snprintf(name, sizeof(name), "%s-clk-fd%d", g->name, fd); |
518 | file = anon_inode_getfile(name, fops, dev, O_RDWR); | 518 | file = anon_inode_getfile(name, fops, dev, O_RDWR); |
519 | if (IS_ERR(file)) { | 519 | if (IS_ERR(file)) { |
520 | err = PTR_ERR(file); | 520 | err = PTR_ERR(file); |
diff --git a/drivers/gpu/nvgpu/common/nvgpu_common.c b/drivers/gpu/nvgpu/common/nvgpu_common.c index 771d4121..843228e9 100644 --- a/drivers/gpu/nvgpu/common/nvgpu_common.c +++ b/drivers/gpu/nvgpu/common/nvgpu_common.c | |||
@@ -230,8 +230,8 @@ const struct firmware *nvgpu_request_firmware(struct gk20a *g, | |||
230 | if (!current->fs || !fw_name) | 230 | if (!current->fs || !fw_name) |
231 | return NULL; | 231 | return NULL; |
232 | 232 | ||
233 | BUG_ON(!g->ops.name); | 233 | BUG_ON(!g->name); |
234 | fw = do_request_firmware(dev, g->ops.name, fw_name, flags); | 234 | fw = do_request_firmware(dev, g->name, fw_name, flags); |
235 | 235 | ||
236 | #ifdef CONFIG_TEGRA_GK20A | 236 | #ifdef CONFIG_TEGRA_GK20A |
237 | /* TO BE REMOVED - Support loading from legacy SOC specific path. */ | 237 | /* TO BE REMOVED - Support loading from legacy SOC specific path. */ |
diff --git a/drivers/gpu/nvgpu/gk20a/as_gk20a.c b/drivers/gpu/nvgpu/gk20a/as_gk20a.c index 01c05d00..7dcb8ed7 100644 --- a/drivers/gpu/nvgpu/gk20a/as_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/as_gk20a.c | |||
@@ -381,7 +381,7 @@ long gk20a_as_dev_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) | |||
381 | 381 | ||
382 | switch (cmd) { | 382 | switch (cmd) { |
383 | case NVGPU_AS_IOCTL_BIND_CHANNEL: | 383 | case NVGPU_AS_IOCTL_BIND_CHANNEL: |
384 | trace_gk20a_as_ioctl_bind_channel(dev_name(dev_from_gk20a(g))); | 384 | trace_gk20a_as_ioctl_bind_channel(g->name); |
385 | err = gk20a_as_ioctl_bind_channel(as_share, | 385 | err = gk20a_as_ioctl_bind_channel(as_share, |
386 | (struct nvgpu_as_bind_channel_args *)buf); | 386 | (struct nvgpu_as_bind_channel_args *)buf); |
387 | 387 | ||
@@ -396,38 +396,38 @@ long gk20a_as_dev_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) | |||
396 | args.page_size = args32->page_size; | 396 | args.page_size = args32->page_size; |
397 | args.flags = args32->flags; | 397 | args.flags = args32->flags; |
398 | args.o_a.offset = args32->o_a.offset; | 398 | args.o_a.offset = args32->o_a.offset; |
399 | trace_gk20a_as_ioctl_alloc_space(dev_name(dev_from_gk20a(g))); | 399 | trace_gk20a_as_ioctl_alloc_space(g->name); |
400 | err = gk20a_as_ioctl_alloc_space(as_share, &args); | 400 | err = gk20a_as_ioctl_alloc_space(as_share, &args); |
401 | args32->o_a.offset = args.o_a.offset; | 401 | args32->o_a.offset = args.o_a.offset; |
402 | break; | 402 | break; |
403 | } | 403 | } |
404 | case NVGPU_AS_IOCTL_ALLOC_SPACE: | 404 | case NVGPU_AS_IOCTL_ALLOC_SPACE: |
405 | trace_gk20a_as_ioctl_alloc_space(dev_name(dev_from_gk20a(g))); | 405 | trace_gk20a_as_ioctl_alloc_space(g->name); |
406 | err = gk20a_as_ioctl_alloc_space(as_share, | 406 | err = gk20a_as_ioctl_alloc_space(as_share, |
407 | (struct nvgpu_as_alloc_space_args *)buf); | 407 | (struct nvgpu_as_alloc_space_args *)buf); |
408 | break; | 408 | break; |
409 | case NVGPU_AS_IOCTL_FREE_SPACE: | 409 | case NVGPU_AS_IOCTL_FREE_SPACE: |
410 | trace_gk20a_as_ioctl_free_space(dev_name(dev_from_gk20a(g))); | 410 | trace_gk20a_as_ioctl_free_space(g->name); |
411 | err = gk20a_as_ioctl_free_space(as_share, | 411 | err = gk20a_as_ioctl_free_space(as_share, |
412 | (struct nvgpu_as_free_space_args *)buf); | 412 | (struct nvgpu_as_free_space_args *)buf); |
413 | break; | 413 | break; |
414 | case NVGPU_AS_IOCTL_MAP_BUFFER: | 414 | case NVGPU_AS_IOCTL_MAP_BUFFER: |
415 | trace_gk20a_as_ioctl_map_buffer(dev_name(dev_from_gk20a(g))); | 415 | trace_gk20a_as_ioctl_map_buffer(g->name); |
416 | err = gk20a_as_ioctl_map_buffer(as_share, | 416 | err = gk20a_as_ioctl_map_buffer(as_share, |
417 | (struct nvgpu_as_map_buffer_args *)buf); | 417 | (struct nvgpu_as_map_buffer_args *)buf); |
418 | break; | 418 | break; |
419 | case NVGPU_AS_IOCTL_MAP_BUFFER_EX: | 419 | case NVGPU_AS_IOCTL_MAP_BUFFER_EX: |
420 | trace_gk20a_as_ioctl_map_buffer(dev_name(dev_from_gk20a(g))); | 420 | trace_gk20a_as_ioctl_map_buffer(g->name); |
421 | err = gk20a_as_ioctl_map_buffer_ex(as_share, | 421 | err = gk20a_as_ioctl_map_buffer_ex(as_share, |
422 | (struct nvgpu_as_map_buffer_ex_args *)buf); | 422 | (struct nvgpu_as_map_buffer_ex_args *)buf); |
423 | break; | 423 | break; |
424 | case NVGPU_AS_IOCTL_UNMAP_BUFFER: | 424 | case NVGPU_AS_IOCTL_UNMAP_BUFFER: |
425 | trace_gk20a_as_ioctl_unmap_buffer(dev_name(dev_from_gk20a(g))); | 425 | trace_gk20a_as_ioctl_unmap_buffer(g->name); |
426 | err = gk20a_as_ioctl_unmap_buffer(as_share, | 426 | err = gk20a_as_ioctl_unmap_buffer(as_share, |
427 | (struct nvgpu_as_unmap_buffer_args *)buf); | 427 | (struct nvgpu_as_unmap_buffer_args *)buf); |
428 | break; | 428 | break; |
429 | case NVGPU_AS_IOCTL_GET_VA_REGIONS: | 429 | case NVGPU_AS_IOCTL_GET_VA_REGIONS: |
430 | trace_gk20a_as_ioctl_get_va_regions(dev_name(dev_from_gk20a(g))); | 430 | trace_gk20a_as_ioctl_get_va_regions(g->name); |
431 | err = gk20a_as_ioctl_get_va_regions(as_share, | 431 | err = gk20a_as_ioctl_get_va_regions(as_share, |
432 | (struct nvgpu_as_get_va_regions_args *)buf); | 432 | (struct nvgpu_as_get_va_regions_args *)buf); |
433 | break; | 433 | break; |
diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c index 8e0d3407..88495bde 100644 --- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c | |||
@@ -1245,7 +1245,7 @@ int gk20a_channel_release(struct inode *inode, struct file *filp) | |||
1245 | goto channel_release; | 1245 | goto channel_release; |
1246 | } | 1246 | } |
1247 | 1247 | ||
1248 | trace_gk20a_channel_release(dev_name(g->dev)); | 1248 | trace_gk20a_channel_release(g->name); |
1249 | 1249 | ||
1250 | gk20a_channel_close(ch); | 1250 | gk20a_channel_close(ch); |
1251 | gk20a_idle(g); | 1251 | gk20a_idle(g); |
@@ -1396,7 +1396,7 @@ static int __gk20a_channel_open(struct gk20a *g, struct file *filp, s32 runlist_ | |||
1396 | if (!g) | 1396 | if (!g) |
1397 | return -ENODEV; | 1397 | return -ENODEV; |
1398 | 1398 | ||
1399 | trace_gk20a_channel_open(dev_name(g->dev)); | 1399 | trace_gk20a_channel_open(g->name); |
1400 | 1400 | ||
1401 | priv = nvgpu_kzalloc(g, sizeof(*priv)); | 1401 | priv = nvgpu_kzalloc(g, sizeof(*priv)); |
1402 | if (!priv) { | 1402 | if (!priv) { |
@@ -1463,7 +1463,7 @@ int gk20a_channel_open_ioctl(struct gk20a *g, | |||
1463 | fd = err; | 1463 | fd = err; |
1464 | 1464 | ||
1465 | snprintf(name, sizeof(name), "nvhost-%s-fd%d", | 1465 | snprintf(name, sizeof(name), "nvhost-%s-fd%d", |
1466 | dev_name(g->dev), fd); | 1466 | g->name, fd); |
1467 | 1467 | ||
1468 | file = anon_inode_getfile(name, g->channel.cdev.ops, NULL, O_RDWR); | 1468 | file = anon_inode_getfile(name, g->channel.cdev.ops, NULL, O_RDWR); |
1469 | if (IS_ERR(file)) { | 1469 | if (IS_ERR(file)) { |
@@ -2041,7 +2041,7 @@ static void trace_write_pushbuffer(struct channel_gk20a *c, | |||
2041 | */ | 2041 | */ |
2042 | for (i = 0; i < words; i += 128U) { | 2042 | for (i = 0; i < words; i += 128U) { |
2043 | trace_gk20a_push_cmdbuf( | 2043 | trace_gk20a_push_cmdbuf( |
2044 | dev_name(c->g->dev), | 2044 | c->g->name, |
2045 | 0, | 2045 | 0, |
2046 | min(words - i, 128U), | 2046 | min(words - i, 128U), |
2047 | offset + i * sizeof(u32), | 2047 | offset + i * sizeof(u32), |
@@ -2442,7 +2442,7 @@ int nvgpu_channel_worker_init(struct gk20a *g) | |||
2442 | INIT_LIST_HEAD(&g->channel_worker.items); | 2442 | INIT_LIST_HEAD(&g->channel_worker.items); |
2443 | nvgpu_spinlock_init(&g->channel_worker.items_lock); | 2443 | nvgpu_spinlock_init(&g->channel_worker.items_lock); |
2444 | task = kthread_run(gk20a_channel_poll_worker, g, | 2444 | task = kthread_run(gk20a_channel_poll_worker, g, |
2445 | "nvgpu_channel_poll_%s", dev_name(g->dev)); | 2445 | "nvgpu_channel_poll_%s", g->name); |
2446 | if (IS_ERR(task)) { | 2446 | if (IS_ERR(task)) { |
2447 | gk20a_err(g->dev, "failed to start channel poller thread"); | 2447 | gk20a_err(g->dev, "failed to start channel poller thread"); |
2448 | return PTR_ERR(task); | 2448 | return PTR_ERR(task); |
@@ -2753,7 +2753,7 @@ static void gk20a_submit_append_priv_cmdbuf(struct channel_gk20a *c, | |||
2753 | &x, sizeof(x)); | 2753 | &x, sizeof(x)); |
2754 | 2754 | ||
2755 | if (cmd->mem->aperture == APERTURE_SYSMEM) | 2755 | if (cmd->mem->aperture == APERTURE_SYSMEM) |
2756 | trace_gk20a_push_cmdbuf(dev_name(g->dev), 0, cmd->size, 0, | 2756 | trace_gk20a_push_cmdbuf(g->name, 0, cmd->size, 0, |
2757 | cmd->mem->cpu_va + cmd->off * sizeof(u32)); | 2757 | cmd->mem->cpu_va + cmd->off * sizeof(u32)); |
2758 | 2758 | ||
2759 | c->gpfifo.put = (c->gpfifo.put + 1) & (c->gpfifo.entry_num - 1); | 2759 | c->gpfifo.put = (c->gpfifo.put + 1) & (c->gpfifo.entry_num - 1); |
@@ -3147,7 +3147,7 @@ int gk20a_submit_channel_gpfifo(struct channel_gk20a *c, | |||
3147 | } | 3147 | } |
3148 | } | 3148 | } |
3149 | 3149 | ||
3150 | trace_gk20a_channel_submit_gpfifo(dev_name(c->g->dev), | 3150 | trace_gk20a_channel_submit_gpfifo(g->name, |
3151 | c->hw_chid, | 3151 | c->hw_chid, |
3152 | num_entries, | 3152 | num_entries, |
3153 | flags, | 3153 | flags, |
@@ -3219,7 +3219,7 @@ int gk20a_submit_channel_gpfifo(struct channel_gk20a *c, | |||
3219 | 3219 | ||
3220 | g->ops.fifo.userd_gp_put(g, c); | 3220 | g->ops.fifo.userd_gp_put(g, c); |
3221 | 3221 | ||
3222 | trace_gk20a_channel_submitted_gpfifo(dev_name(c->g->dev), | 3222 | trace_gk20a_channel_submitted_gpfifo(g->name, |
3223 | c->hw_chid, | 3223 | c->hw_chid, |
3224 | num_entries, | 3224 | num_entries, |
3225 | flags, | 3225 | flags, |
diff --git a/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c index ae22ee7d..e84f70a2 100644 --- a/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c | |||
@@ -354,7 +354,7 @@ gk20a_channel_syncpt_create(struct channel_gk20a *c) | |||
354 | sp->host1x_pdev = c->g->host1x_dev; | 354 | sp->host1x_pdev = c->g->host1x_dev; |
355 | 355 | ||
356 | snprintf(syncpt_name, sizeof(syncpt_name), | 356 | snprintf(syncpt_name, sizeof(syncpt_name), |
357 | "%s_%d", dev_name(c->g->dev), c->hw_chid); | 357 | "%s_%d", c->g->name, c->hw_chid); |
358 | 358 | ||
359 | sp->id = nvhost_get_syncpt_host_managed(sp->host1x_pdev, | 359 | sp->id = nvhost_get_syncpt_host_managed(sp->host1x_pdev, |
360 | c->hw_chid, syncpt_name); | 360 | c->hw_chid, syncpt_name); |
diff --git a/drivers/gpu/nvgpu/gk20a/ctrl_gk20a.c b/drivers/gpu/nvgpu/gk20a/ctrl_gk20a.c index 1ae42337..97125a99 100644 --- a/drivers/gpu/nvgpu/gk20a/ctrl_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/ctrl_gk20a.c | |||
@@ -198,7 +198,6 @@ static int gk20a_ctrl_alloc_as( | |||
198 | struct gk20a *g, | 198 | struct gk20a *g, |
199 | struct nvgpu_alloc_as_args *args) | 199 | struct nvgpu_alloc_as_args *args) |
200 | { | 200 | { |
201 | struct device *dev = g->dev; | ||
202 | struct gk20a_as_share *as_share; | 201 | struct gk20a_as_share *as_share; |
203 | int err; | 202 | int err; |
204 | int fd; | 203 | int fd; |
@@ -211,7 +210,7 @@ static int gk20a_ctrl_alloc_as( | |||
211 | fd = err; | 210 | fd = err; |
212 | 211 | ||
213 | name = kasprintf(GFP_KERNEL, "nvhost-%s-fd%d", | 212 | name = kasprintf(GFP_KERNEL, "nvhost-%s-fd%d", |
214 | dev_name(dev), fd); | 213 | g->name, fd); |
215 | 214 | ||
216 | file = anon_inode_getfile(name, g->as.cdev.ops, NULL, O_RDWR); | 215 | file = anon_inode_getfile(name, g->as.cdev.ops, NULL, O_RDWR); |
217 | kfree(name); | 216 | kfree(name); |
@@ -241,7 +240,6 @@ clean_up: | |||
241 | static int gk20a_ctrl_open_tsg(struct gk20a *g, | 240 | static int gk20a_ctrl_open_tsg(struct gk20a *g, |
242 | struct nvgpu_gpu_open_tsg_args *args) | 241 | struct nvgpu_gpu_open_tsg_args *args) |
243 | { | 242 | { |
244 | struct device *dev = g->dev; | ||
245 | int err; | 243 | int err; |
246 | int fd; | 244 | int fd; |
247 | struct file *file; | 245 | struct file *file; |
@@ -253,7 +251,7 @@ static int gk20a_ctrl_open_tsg(struct gk20a *g, | |||
253 | fd = err; | 251 | fd = err; |
254 | 252 | ||
255 | name = kasprintf(GFP_KERNEL, "nvgpu-%s-tsg%d", | 253 | name = kasprintf(GFP_KERNEL, "nvgpu-%s-tsg%d", |
256 | dev_name(dev), fd); | 254 | g->name, fd); |
257 | 255 | ||
258 | file = anon_inode_getfile(name, g->tsg.cdev.ops, NULL, O_RDWR); | 256 | file = anon_inode_getfile(name, g->tsg.cdev.ops, NULL, O_RDWR); |
259 | kfree(name); | 257 | kfree(name); |
diff --git a/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c b/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c index 165bcf46..b5098849 100644 --- a/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c | |||
@@ -123,7 +123,7 @@ static int gk20a_dbg_gpu_do_dev_open(struct inode *inode, | |||
123 | 123 | ||
124 | dev = g->dev; | 124 | dev = g->dev; |
125 | 125 | ||
126 | gk20a_dbg(gpu_dbg_fn | gpu_dbg_gpu_dbg, "dbg session: %s", dev_name(dev)); | 126 | gk20a_dbg(gpu_dbg_fn | gpu_dbg_gpu_dbg, "dbg session: %s", g->name); |
127 | 127 | ||
128 | err = alloc_session(&dbg_session); | 128 | err = alloc_session(&dbg_session); |
129 | if (err) | 129 | if (err) |
@@ -476,7 +476,7 @@ static int dbg_unbind_channel_gk20a(struct dbg_session_gk20a *dbg_s, | |||
476 | int err; | 476 | int err; |
477 | 477 | ||
478 | gk20a_dbg(gpu_dbg_fn|gpu_dbg_gpu_dbg, "%s fd=%d", | 478 | gk20a_dbg(gpu_dbg_fn|gpu_dbg_gpu_dbg, "%s fd=%d", |
479 | dev_name(dbg_s->dev), args->channel_fd); | 479 | g->name, args->channel_fd); |
480 | 480 | ||
481 | ch = gk20a_get_channel_from_file(args->channel_fd); | 481 | ch = gk20a_get_channel_from_file(args->channel_fd); |
482 | if (!ch) { | 482 | if (!ch) { |
@@ -513,7 +513,7 @@ int gk20a_dbg_gpu_dev_release(struct inode *inode, struct file *filp) | |||
513 | struct gk20a *g = dbg_s->g; | 513 | struct gk20a *g = dbg_s->g; |
514 | struct dbg_profiler_object_data *prof_obj, *tmp_obj; | 514 | struct dbg_profiler_object_data *prof_obj, *tmp_obj; |
515 | 515 | ||
516 | gk20a_dbg(gpu_dbg_gpu_dbg | gpu_dbg_fn, "%s", dev_name(dbg_s->dev)); | 516 | gk20a_dbg(gpu_dbg_gpu_dbg | gpu_dbg_fn, "%s", g->name); |
517 | 517 | ||
518 | /* unbind channels */ | 518 | /* unbind channels */ |
519 | dbg_unbind_all_channels_gk20a(dbg_s); | 519 | dbg_unbind_all_channels_gk20a(dbg_s); |
@@ -561,7 +561,7 @@ static int dbg_bind_channel_gk20a(struct dbg_session_gk20a *dbg_s, | |||
561 | struct dbg_session_data *session_data; | 561 | struct dbg_session_data *session_data; |
562 | 562 | ||
563 | gk20a_dbg(gpu_dbg_fn|gpu_dbg_gpu_dbg, "%s fd=%d", | 563 | gk20a_dbg(gpu_dbg_fn|gpu_dbg_gpu_dbg, "%s fd=%d", |
564 | dev_name(dbg_s->dev), args->channel_fd); | 564 | g->name, args->channel_fd); |
565 | 565 | ||
566 | /* even though get_file_channel is doing this it releases it as well */ | 566 | /* even though get_file_channel is doing this it releases it as well */ |
567 | /* by holding it here we'll keep it from disappearing while the | 567 | /* by holding it here we'll keep it from disappearing while the |
@@ -577,7 +577,7 @@ static int dbg_bind_channel_gk20a(struct dbg_session_gk20a *dbg_s, | |||
577 | return -EINVAL; | 577 | return -EINVAL; |
578 | } | 578 | } |
579 | 579 | ||
580 | gk20a_dbg_fn("%s hwchid=%d", dev_name(dbg_s->dev), ch->hw_chid); | 580 | gk20a_dbg_fn("%s hwchid=%d", g->name, ch->hw_chid); |
581 | 581 | ||
582 | nvgpu_mutex_acquire(&g->dbg_sessions_lock); | 582 | nvgpu_mutex_acquire(&g->dbg_sessions_lock); |
583 | nvgpu_mutex_acquire(&ch->dbg_s_lock); | 583 | nvgpu_mutex_acquire(&ch->dbg_s_lock); |
@@ -1262,7 +1262,7 @@ static int dbg_set_powergate(struct dbg_session_gk20a *dbg_s, u32 powermode) | |||
1262 | /* This function must be called with g->dbg_sessions_lock held */ | 1262 | /* This function must be called with g->dbg_sessions_lock held */ |
1263 | 1263 | ||
1264 | gk20a_dbg(gpu_dbg_fn|gpu_dbg_gpu_dbg, "%s powergate mode = %d", | 1264 | gk20a_dbg(gpu_dbg_fn|gpu_dbg_gpu_dbg, "%s powergate mode = %d", |
1265 | dev_name(dbg_s->dev), powermode); | 1265 | g->name, powermode); |
1266 | 1266 | ||
1267 | switch (powermode) { | 1267 | switch (powermode) { |
1268 | case NVGPU_DBG_GPU_POWERGATE_MODE_DISABLE: | 1268 | case NVGPU_DBG_GPU_POWERGATE_MODE_DISABLE: |
@@ -1352,7 +1352,7 @@ static int dbg_set_powergate(struct dbg_session_gk20a *dbg_s, u32 powermode) | |||
1352 | } | 1352 | } |
1353 | 1353 | ||
1354 | gk20a_dbg(gpu_dbg_fn|gpu_dbg_gpu_dbg, "%s powergate mode = %d done", | 1354 | gk20a_dbg(gpu_dbg_fn|gpu_dbg_gpu_dbg, "%s powergate mode = %d done", |
1355 | dev_name(dbg_s->dev), powermode); | 1355 | g->name, powermode); |
1356 | return err; | 1356 | return err; |
1357 | } | 1357 | } |
1358 | 1358 | ||
@@ -1362,7 +1362,7 @@ static int nvgpu_ioctl_powergate_gk20a(struct dbg_session_gk20a *dbg_s, | |||
1362 | int err; | 1362 | int err; |
1363 | struct gk20a *g = dbg_s->g; | 1363 | struct gk20a *g = dbg_s->g; |
1364 | gk20a_dbg_fn("%s powergate mode = %d", | 1364 | gk20a_dbg_fn("%s powergate mode = %d", |
1365 | dev_name(dbg_s->dev), args->mode); | 1365 | g->name, args->mode); |
1366 | 1366 | ||
1367 | nvgpu_mutex_acquire(&g->dbg_sessions_lock); | 1367 | nvgpu_mutex_acquire(&g->dbg_sessions_lock); |
1368 | err = g->ops.dbg_session_ops.dbg_set_powergate(dbg_s, args->mode); | 1368 | err = g->ops.dbg_session_ops.dbg_set_powergate(dbg_s, args->mode); |
@@ -1378,7 +1378,7 @@ static int nvgpu_dbg_gpu_ioctl_smpc_ctxsw_mode(struct dbg_session_gk20a *dbg_s, | |||
1378 | struct channel_gk20a *ch_gk20a; | 1378 | struct channel_gk20a *ch_gk20a; |
1379 | 1379 | ||
1380 | gk20a_dbg_fn("%s smpc ctxsw mode = %d", | 1380 | gk20a_dbg_fn("%s smpc ctxsw mode = %d", |
1381 | dev_name(dbg_s->dev), args->mode); | 1381 | g->name, args->mode); |
1382 | 1382 | ||
1383 | err = gk20a_busy(g); | 1383 | err = gk20a_busy(g); |
1384 | if (err) { | 1384 | if (err) { |
@@ -1420,7 +1420,7 @@ static int nvgpu_dbg_gpu_ioctl_hwpm_ctxsw_mode(struct dbg_session_gk20a *dbg_s, | |||
1420 | struct channel_gk20a *ch_gk20a; | 1420 | struct channel_gk20a *ch_gk20a; |
1421 | 1421 | ||
1422 | gk20a_dbg_fn("%s pm ctxsw mode = %d", | 1422 | gk20a_dbg_fn("%s pm ctxsw mode = %d", |
1423 | dev_name(dbg_s->dev), args->mode); | 1423 | g->name, args->mode); |
1424 | 1424 | ||
1425 | /* Must have a valid reservation to enable/disable hwpm cxtsw. | 1425 | /* Must have a valid reservation to enable/disable hwpm cxtsw. |
1426 | * Just print an error message for now, but eventually this should | 1426 | * Just print an error message for now, but eventually this should |
@@ -1523,7 +1523,7 @@ static int nvgpu_ioctl_allocate_profiler_object( | |||
1523 | struct gk20a *g = get_gk20a(dbg_s->dev); | 1523 | struct gk20a *g = get_gk20a(dbg_s->dev); |
1524 | struct dbg_profiler_object_data *prof_obj; | 1524 | struct dbg_profiler_object_data *prof_obj; |
1525 | 1525 | ||
1526 | gk20a_dbg_fn("%s", dev_name(dbg_s->dev)); | 1526 | gk20a_dbg_fn("%s", g->name); |
1527 | 1527 | ||
1528 | nvgpu_mutex_acquire(&g->dbg_sessions_lock); | 1528 | nvgpu_mutex_acquire(&g->dbg_sessions_lock); |
1529 | 1529 | ||
@@ -1567,7 +1567,7 @@ static int nvgpu_ioctl_free_profiler_object( | |||
1567 | bool obj_found = false; | 1567 | bool obj_found = false; |
1568 | 1568 | ||
1569 | gk20a_dbg_fn("%s session_id = %d profiler_handle = %x", | 1569 | gk20a_dbg_fn("%s session_id = %d profiler_handle = %x", |
1570 | dev_name(dbg_s->dev), dbg_s->id, args->profiler_handle); | 1570 | g->name, dbg_s->id, args->profiler_handle); |
1571 | 1571 | ||
1572 | nvgpu_mutex_acquire(&g->dbg_sessions_lock); | 1572 | nvgpu_mutex_acquire(&g->dbg_sessions_lock); |
1573 | 1573 | ||
@@ -1674,7 +1674,7 @@ static int nvgpu_profiler_reserve_acquire(struct dbg_session_gk20a *dbg_s, | |||
1674 | struct dbg_profiler_object_data *prof_obj, *my_prof_obj; | 1674 | struct dbg_profiler_object_data *prof_obj, *my_prof_obj; |
1675 | int err = 0; | 1675 | int err = 0; |
1676 | 1676 | ||
1677 | gk20a_dbg_fn("%s profiler_handle = %x", dev_name(dbg_s->dev), profiler_handle); | 1677 | gk20a_dbg_fn("%s profiler_handle = %x", g->name, profiler_handle); |
1678 | 1678 | ||
1679 | if (g->profiler_reservation_count < 0) { | 1679 | if (g->profiler_reservation_count < 0) { |
1680 | gk20a_err(dev_from_gk20a(g), "Negative reservation count!"); | 1680 | gk20a_err(dev_from_gk20a(g), "Negative reservation count!"); |
@@ -1776,7 +1776,7 @@ static int nvgpu_profiler_reserve_release(struct dbg_session_gk20a *dbg_s, | |||
1776 | struct dbg_profiler_object_data *prof_obj; | 1776 | struct dbg_profiler_object_data *prof_obj; |
1777 | int err = 0; | 1777 | int err = 0; |
1778 | 1778 | ||
1779 | gk20a_dbg_fn("%s profiler_handle = %x", dev_name(dbg_s->dev), profiler_handle); | 1779 | gk20a_dbg_fn("%s profiler_handle = %x", g->name, profiler_handle); |
1780 | 1780 | ||
1781 | nvgpu_mutex_acquire(&g->dbg_sessions_lock); | 1781 | nvgpu_mutex_acquire(&g->dbg_sessions_lock); |
1782 | 1782 | ||
diff --git a/drivers/gpu/nvgpu/gk20a/fb_gk20a.c b/drivers/gpu/nvgpu/gk20a/fb_gk20a.c index a1d348a4..28dfee01 100644 --- a/drivers/gpu/nvgpu/gk20a/fb_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/fb_gk20a.c | |||
@@ -117,7 +117,7 @@ void gk20a_fb_tlb_invalidate(struct gk20a *g, struct mem_desc *pdb) | |||
117 | 117 | ||
118 | nvgpu_mutex_acquire(&g->mm.tlb_lock); | 118 | nvgpu_mutex_acquire(&g->mm.tlb_lock); |
119 | 119 | ||
120 | trace_gk20a_mm_tlb_invalidate(dev_name(g->dev)); | 120 | trace_gk20a_mm_tlb_invalidate(g->name); |
121 | 121 | ||
122 | nvgpu_timeout_init(g, &timeout, 1000, NVGPU_TIMER_RETRY_TIMER); | 122 | nvgpu_timeout_init(g, &timeout, 1000, NVGPU_TIMER_RETRY_TIMER); |
123 | 123 | ||
@@ -153,7 +153,7 @@ void gk20a_fb_tlb_invalidate(struct gk20a *g, struct mem_desc *pdb) | |||
153 | } while (!nvgpu_timeout_expired_msg(&timeout, | 153 | } while (!nvgpu_timeout_expired_msg(&timeout, |
154 | "wait mmu invalidate")); | 154 | "wait mmu invalidate")); |
155 | 155 | ||
156 | trace_gk20a_mm_tlb_invalidate_done(dev_name(g->dev)); | 156 | trace_gk20a_mm_tlb_invalidate_done(g->name); |
157 | 157 | ||
158 | out: | 158 | out: |
159 | nvgpu_mutex_release(&g->mm.tlb_lock); | 159 | nvgpu_mutex_release(&g->mm.tlb_lock); |
diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c index 35a07439..fdac40de 100644 --- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c | |||
@@ -3740,7 +3740,7 @@ void gk20a_dump_channel_status_ramfc(struct gk20a *g, | |||
3740 | syncpointb = inst_mem[ram_fc_syncpointb_w()]; | 3740 | syncpointb = inst_mem[ram_fc_syncpointb_w()]; |
3741 | 3741 | ||
3742 | gk20a_debug_output(o, "%d-%s, pid %d, refs: %d: ", hw_chid, | 3742 | gk20a_debug_output(o, "%d-%s, pid %d, refs: %d: ", hw_chid, |
3743 | dev_name(g->dev), | 3743 | g->name, |
3744 | ch_state->pid, | 3744 | ch_state->pid, |
3745 | ch_state->refs); | 3745 | ch_state->refs); |
3746 | gk20a_debug_output(o, "channel status: %s in use %s %s\n", | 3746 | gk20a_debug_output(o, "channel status: %s in use %s %s\n", |
@@ -3799,7 +3799,7 @@ void gk20a_dump_pbdma_status(struct gk20a *g, | |||
3799 | u32 status = gk20a_readl(g, fifo_pbdma_status_r(i)); | 3799 | u32 status = gk20a_readl(g, fifo_pbdma_status_r(i)); |
3800 | u32 chan_status = fifo_pbdma_status_chan_status_v(status); | 3800 | u32 chan_status = fifo_pbdma_status_chan_status_v(status); |
3801 | 3801 | ||
3802 | gk20a_debug_output(o, "%s pbdma %d: ", dev_name(g->dev), i); | 3802 | gk20a_debug_output(o, "%s pbdma %d: ", g->name, i); |
3803 | gk20a_debug_output(o, | 3803 | gk20a_debug_output(o, |
3804 | "id: %d (%s), next_id: %d (%s) chan status: %s\n", | 3804 | "id: %d (%s), next_id: %d (%s) chan status: %s\n", |
3805 | fifo_pbdma_status_id_v(status), | 3805 | fifo_pbdma_status_id_v(status), |
@@ -3832,7 +3832,7 @@ void gk20a_dump_eng_status(struct gk20a *g, | |||
3832 | u32 status = gk20a_readl(g, fifo_engine_status_r(i)); | 3832 | u32 status = gk20a_readl(g, fifo_engine_status_r(i)); |
3833 | u32 ctx_status = fifo_engine_status_ctx_status_v(status); | 3833 | u32 ctx_status = fifo_engine_status_ctx_status_v(status); |
3834 | 3834 | ||
3835 | gk20a_debug_output(o, "%s eng %d: ", dev_name(g->dev), i); | 3835 | gk20a_debug_output(o, "%s eng %d: ", g->name, i); |
3836 | gk20a_debug_output(o, | 3836 | gk20a_debug_output(o, |
3837 | "id: %d (%s), next_id: %d (%s), ctx status: %s ", | 3837 | "id: %d (%s), next_id: %d (%s), ctx status: %s ", |
3838 | fifo_engine_status_id_v(status), | 3838 | fifo_engine_status_id_v(status), |
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c index b715e661..0495e9d1 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gk20a.c | |||
@@ -500,7 +500,7 @@ int gk20a_pm_finalize_poweron(struct device *dev) | |||
500 | if (g->power_on) | 500 | if (g->power_on) |
501 | return 0; | 501 | return 0; |
502 | 502 | ||
503 | trace_gk20a_finalize_poweron(dev_name(dev)); | 503 | trace_gk20a_finalize_poweron(g->name); |
504 | 504 | ||
505 | /* Increment platform power refcount */ | 505 | /* Increment platform power refcount */ |
506 | if (platform->busy) { | 506 | if (platform->busy) { |
@@ -687,7 +687,7 @@ int gk20a_pm_finalize_poweron(struct device *dev) | |||
687 | 687 | ||
688 | gk20a_scale_resume(dev); | 688 | gk20a_scale_resume(dev); |
689 | 689 | ||
690 | trace_gk20a_finalize_poweron_done(dev_name(dev)); | 690 | trace_gk20a_finalize_poweron_done(g->name); |
691 | 691 | ||
692 | if (platform->has_cde) | 692 | if (platform->has_cde) |
693 | gk20a_init_cde_support(g); | 693 | gk20a_init_cde_support(g); |
@@ -793,8 +793,8 @@ static int gk20a_create_device( | |||
793 | if (IS_ERR(subdev)) { | 793 | if (IS_ERR(subdev)) { |
794 | err = PTR_ERR(dev); | 794 | err = PTR_ERR(dev); |
795 | cdev_del(cdev); | 795 | cdev_del(cdev); |
796 | dev_err(dev, "failed to create %s device for %s\n", | 796 | dev_err(dev, "failed to create %s device\n", |
797 | cdev_name, dev_name(dev)); | 797 | cdev_name); |
798 | return err; | 798 | return err; |
799 | } | 799 | } |
800 | 800 | ||
@@ -971,7 +971,7 @@ static int gk20a_pm_unrailgate(struct device *dev) | |||
971 | g->pstats.railgating_cycle_count++; | 971 | g->pstats.railgating_cycle_count++; |
972 | #endif | 972 | #endif |
973 | 973 | ||
974 | trace_gk20a_pm_unrailgate(dev_name(dev)); | 974 | trace_gk20a_pm_unrailgate(g->name); |
975 | 975 | ||
976 | if (platform->unrailgate) { | 976 | if (platform->unrailgate) { |
977 | nvgpu_mutex_acquire(&platform->railgate_lock); | 977 | nvgpu_mutex_acquire(&platform->railgate_lock); |
@@ -1765,7 +1765,7 @@ int gk20a_init_gpu_characteristics(struct gk20a *g) | |||
1765 | gpu->event_ioctl_nr_last = NVGPU_EVENT_IOCTL_LAST; | 1765 | gpu->event_ioctl_nr_last = NVGPU_EVENT_IOCTL_LAST; |
1766 | gpu->gpu_va_bit_count = 40; | 1766 | gpu->gpu_va_bit_count = 40; |
1767 | 1767 | ||
1768 | strlcpy(gpu->chipname, g->ops.name, sizeof(gpu->chipname)); | 1768 | strlcpy(gpu->chipname, g->name, sizeof(gpu->chipname)); |
1769 | gpu->max_fbps_count = g->ops.gr.get_max_fbps_count(g); | 1769 | gpu->max_fbps_count = g->ops.gr.get_max_fbps_count(g); |
1770 | gpu->fbp_en_mask = g->ops.gr.get_fbp_en_mask(g); | 1770 | gpu->fbp_en_mask = g->ops.gr.get_fbp_en_mask(g); |
1771 | gpu->max_ltc_per_fbp = g->ops.gr.get_max_ltc_per_fbp(g); | 1771 | gpu->max_ltc_per_fbp = g->ops.gr.get_max_ltc_per_fbp(g); |
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h index ce26125d..c8932d63 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/gk20a.h | |||
@@ -347,7 +347,6 @@ struct gpu_ops { | |||
347 | void (*init_elcg_mode)(struct gk20a *g, u32 mode, u32 engine); | 347 | void (*init_elcg_mode)(struct gk20a *g, u32 mode, u32 engine); |
348 | void (*load_tpc_mask)(struct gk20a *g); | 348 | void (*load_tpc_mask)(struct gk20a *g); |
349 | } gr; | 349 | } gr; |
350 | const char *name; | ||
351 | struct { | 350 | struct { |
352 | void (*init_hw)(struct gk20a *g); | 351 | void (*init_hw)(struct gk20a *g); |
353 | void (*init_fs_state)(struct gk20a *g); | 352 | void (*init_fs_state)(struct gk20a *g); |
@@ -895,6 +894,8 @@ struct gk20a { | |||
895 | void __iomem *bar1; | 894 | void __iomem *bar1; |
896 | void __iomem *bar1_saved; | 895 | void __iomem *bar1_saved; |
897 | 896 | ||
897 | const char *name; | ||
898 | |||
898 | bool gpu_reset_done; | 899 | bool gpu_reset_done; |
899 | bool power_on; | 900 | bool power_on; |
900 | bool suspended; | 901 | bool suspended; |
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c index b23cabe8..3df19a4e 100644 --- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c | |||
@@ -5525,7 +5525,7 @@ static int gr_gk20a_handle_sw_method(struct gk20a *g, u32 addr, | |||
5525 | { | 5525 | { |
5526 | gk20a_dbg_fn(""); | 5526 | gk20a_dbg_fn(""); |
5527 | 5527 | ||
5528 | trace_gr_gk20a_handle_sw_method(dev_name(g->dev)); | 5528 | trace_gr_gk20a_handle_sw_method(g->name); |
5529 | 5529 | ||
5530 | if (class_num == KEPLER_COMPUTE_A) { | 5530 | if (class_num == KEPLER_COMPUTE_A) { |
5531 | switch (offset << 2) { | 5531 | switch (offset << 2) { |
diff --git a/drivers/gpu/nvgpu/gk20a/hal_gk20a.c b/drivers/gpu/nvgpu/gk20a/hal_gk20a.c index 1e4fffdc..dee8a19f 100644 --- a/drivers/gpu/nvgpu/gk20a/hal_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/hal_gk20a.c | |||
@@ -168,7 +168,7 @@ int gk20a_init_hal(struct gk20a *g) | |||
168 | #if defined(CONFIG_GK20A_CYCLE_STATS) | 168 | #if defined(CONFIG_GK20A_CYCLE_STATS) |
169 | gk20a_init_css_ops(gops); | 169 | gk20a_init_css_ops(gops); |
170 | #endif | 170 | #endif |
171 | gops->name = "gk20a"; | 171 | g->name = "gk20a"; |
172 | gops->chip_init_gpu_characteristics = gk20a_init_gpu_characteristics; | 172 | gops->chip_init_gpu_characteristics = gk20a_init_gpu_characteristics; |
173 | gops->get_litter_value = gk20a_get_litter_value; | 173 | gops->get_litter_value = gk20a_get_litter_value; |
174 | 174 | ||
diff --git a/drivers/gpu/nvgpu/gk20a/ltc_gk20a.c b/drivers/gpu/nvgpu/gk20a/ltc_gk20a.c index 9942e58f..1b9d515c 100644 --- a/drivers/gpu/nvgpu/gk20a/ltc_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/ltc_gk20a.c | |||
@@ -116,7 +116,7 @@ static int gk20a_ltc_cbc_ctrl(struct gk20a *g, enum gk20a_cbc_op op, | |||
116 | 116 | ||
117 | gk20a_dbg_fn(""); | 117 | gk20a_dbg_fn(""); |
118 | 118 | ||
119 | trace_gk20a_ltc_cbc_ctrl_start(dev_name(g->dev), op, min, max); | 119 | trace_gk20a_ltc_cbc_ctrl_start(g->name, op, min, max); |
120 | 120 | ||
121 | if (gr->compbit_store.mem.size == 0) | 121 | if (gr->compbit_store.mem.size == 0) |
122 | return 0; | 122 | return 0; |
@@ -168,7 +168,7 @@ static int gk20a_ltc_cbc_ctrl(struct gk20a *g, enum gk20a_cbc_op op, | |||
168 | } | 168 | } |
169 | } | 169 | } |
170 | out: | 170 | out: |
171 | trace_gk20a_ltc_cbc_ctrl_done(dev_name(g->dev)); | 171 | trace_gk20a_ltc_cbc_ctrl_done(g->name); |
172 | nvgpu_mutex_release(&g->mm.l2_op_lock); | 172 | nvgpu_mutex_release(&g->mm.l2_op_lock); |
173 | return err; | 173 | return err; |
174 | } | 174 | } |
diff --git a/drivers/gpu/nvgpu/gk20a/mc_gk20a.c b/drivers/gpu/nvgpu/gk20a/mc_gk20a.c index 3d6919c5..de90355d 100644 --- a/drivers/gpu/nvgpu/gk20a/mc_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/mc_gk20a.c | |||
@@ -44,7 +44,7 @@ irqreturn_t mc_gk20a_isr_stall(struct gk20a *g) | |||
44 | { | 44 | { |
45 | u32 mc_intr_0; | 45 | u32 mc_intr_0; |
46 | 46 | ||
47 | trace_mc_gk20a_intr_stall(dev_name(g->dev)); | 47 | trace_mc_gk20a_intr_stall(g->name); |
48 | 48 | ||
49 | if (!g->power_on) | 49 | if (!g->power_on) |
50 | return IRQ_NONE; | 50 | return IRQ_NONE; |
@@ -62,7 +62,7 @@ irqreturn_t mc_gk20a_isr_stall(struct gk20a *g) | |||
62 | 62 | ||
63 | atomic_inc(&g->hw_irq_stall_count); | 63 | atomic_inc(&g->hw_irq_stall_count); |
64 | 64 | ||
65 | trace_mc_gk20a_intr_stall_done(dev_name(g->dev)); | 65 | trace_mc_gk20a_intr_stall_done(g->name); |
66 | 66 | ||
67 | return IRQ_WAKE_THREAD; | 67 | return IRQ_WAKE_THREAD; |
68 | } | 68 | } |
@@ -115,7 +115,7 @@ irqreturn_t mc_gk20a_intr_thread_stall(struct gk20a *g) | |||
115 | 115 | ||
116 | gk20a_dbg(gpu_dbg_intr, "interrupt thread launched"); | 116 | gk20a_dbg(gpu_dbg_intr, "interrupt thread launched"); |
117 | 117 | ||
118 | trace_mc_gk20a_intr_thread_stall(dev_name(g->dev)); | 118 | trace_mc_gk20a_intr_thread_stall(g->name); |
119 | 119 | ||
120 | mc_intr_0 = gk20a_readl(g, mc_intr_0_r()); | 120 | mc_intr_0 = gk20a_readl(g, mc_intr_0_r()); |
121 | hw_irq_count = atomic_read(&g->hw_irq_stall_count); | 121 | hw_irq_count = atomic_read(&g->hw_irq_stall_count); |
@@ -164,7 +164,7 @@ irqreturn_t mc_gk20a_intr_thread_stall(struct gk20a *g) | |||
164 | 164 | ||
165 | wake_up_all(&g->sw_irq_stall_last_handled_wq); | 165 | wake_up_all(&g->sw_irq_stall_last_handled_wq); |
166 | 166 | ||
167 | trace_mc_gk20a_intr_thread_stall_done(dev_name(g->dev)); | 167 | trace_mc_gk20a_intr_thread_stall_done(g->name); |
168 | 168 | ||
169 | return IRQ_HANDLED; | 169 | return IRQ_HANDLED; |
170 | } | 170 | } |
diff --git a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c index 1beff9b9..102aae75 100644 --- a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c | |||
@@ -5146,7 +5146,7 @@ int gk20a_mm_fb_flush(struct gk20a *g) | |||
5146 | guarantee that writes are to DRAM. This will be a sysmembar internal | 5146 | guarantee that writes are to DRAM. This will be a sysmembar internal |
5147 | to the L2. */ | 5147 | to the L2. */ |
5148 | 5148 | ||
5149 | trace_gk20a_mm_fb_flush(dev_name(g->dev)); | 5149 | trace_gk20a_mm_fb_flush(g->name); |
5150 | 5150 | ||
5151 | gk20a_writel(g, flush_fb_flush_r(), | 5151 | gk20a_writel(g, flush_fb_flush_r(), |
5152 | flush_fb_flush_pending_busy_f()); | 5152 | flush_fb_flush_pending_busy_f()); |
@@ -5170,7 +5170,7 @@ int gk20a_mm_fb_flush(struct gk20a *g) | |||
5170 | ret = -EBUSY; | 5170 | ret = -EBUSY; |
5171 | } | 5171 | } |
5172 | 5172 | ||
5173 | trace_gk20a_mm_fb_flush_done(dev_name(g->dev)); | 5173 | trace_gk20a_mm_fb_flush_done(g->name); |
5174 | 5174 | ||
5175 | nvgpu_mutex_release(&mm->l2_op_lock); | 5175 | nvgpu_mutex_release(&mm->l2_op_lock); |
5176 | 5176 | ||
@@ -5184,7 +5184,7 @@ static void gk20a_mm_l2_invalidate_locked(struct gk20a *g) | |||
5184 | u32 data; | 5184 | u32 data; |
5185 | struct nvgpu_timeout timeout; | 5185 | struct nvgpu_timeout timeout; |
5186 | 5186 | ||
5187 | trace_gk20a_mm_l2_invalidate(dev_name(g->dev)); | 5187 | trace_gk20a_mm_l2_invalidate(g->name); |
5188 | 5188 | ||
5189 | nvgpu_timeout_init(g, &timeout, 200, NVGPU_TIMER_RETRY_TIMER); | 5189 | nvgpu_timeout_init(g, &timeout, 200, NVGPU_TIMER_RETRY_TIMER); |
5190 | 5190 | ||
@@ -5211,7 +5211,7 @@ static void gk20a_mm_l2_invalidate_locked(struct gk20a *g) | |||
5211 | gk20a_warn(dev_from_gk20a(g), | 5211 | gk20a_warn(dev_from_gk20a(g), |
5212 | "l2_system_invalidate too many retries"); | 5212 | "l2_system_invalidate too many retries"); |
5213 | 5213 | ||
5214 | trace_gk20a_mm_l2_invalidate_done(dev_name(g->dev)); | 5214 | trace_gk20a_mm_l2_invalidate_done(g->name); |
5215 | } | 5215 | } |
5216 | 5216 | ||
5217 | void gk20a_mm_l2_invalidate(struct gk20a *g) | 5217 | void gk20a_mm_l2_invalidate(struct gk20a *g) |
@@ -5242,7 +5242,7 @@ void gk20a_mm_l2_flush(struct gk20a *g, bool invalidate) | |||
5242 | 5242 | ||
5243 | nvgpu_mutex_acquire(&mm->l2_op_lock); | 5243 | nvgpu_mutex_acquire(&mm->l2_op_lock); |
5244 | 5244 | ||
5245 | trace_gk20a_mm_l2_flush(dev_name(g->dev)); | 5245 | trace_gk20a_mm_l2_flush(g->name); |
5246 | 5246 | ||
5247 | /* Flush all dirty lines from the L2 to DRAM. Lines are left in the L2 | 5247 | /* Flush all dirty lines from the L2 to DRAM. Lines are left in the L2 |
5248 | as clean, so subsequent reads might hit in the L2. */ | 5248 | as clean, so subsequent reads might hit in the L2. */ |
@@ -5263,7 +5263,7 @@ void gk20a_mm_l2_flush(struct gk20a *g, bool invalidate) | |||
5263 | } while (!nvgpu_timeout_expired_msg(&timeout, | 5263 | } while (!nvgpu_timeout_expired_msg(&timeout, |
5264 | "l2_flush_dirty too many retries")); | 5264 | "l2_flush_dirty too many retries")); |
5265 | 5265 | ||
5266 | trace_gk20a_mm_l2_flush_done(dev_name(g->dev)); | 5266 | trace_gk20a_mm_l2_flush_done(g->name); |
5267 | 5267 | ||
5268 | if (invalidate) | 5268 | if (invalidate) |
5269 | gk20a_mm_l2_invalidate_locked(g); | 5269 | gk20a_mm_l2_invalidate_locked(g); |
diff --git a/drivers/gpu/nvgpu/gk20a/tsg_gk20a.c b/drivers/gpu/nvgpu/gk20a/tsg_gk20a.c index 7725e970..1715c06a 100644 --- a/drivers/gpu/nvgpu/gk20a/tsg_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/tsg_gk20a.c | |||
@@ -427,7 +427,7 @@ int gk20a_tsg_open(struct gk20a *g, struct file *filp) | |||
427 | 427 | ||
428 | dev = dev_from_gk20a(g); | 428 | dev = dev_from_gk20a(g); |
429 | 429 | ||
430 | gk20a_dbg(gpu_dbg_fn, "tsg: %s", dev_name(dev)); | 430 | gk20a_dbg(gpu_dbg_fn, "tsg: %s", g->name); |
431 | 431 | ||
432 | priv = nvgpu_kmalloc(g, sizeof(*priv)); | 432 | priv = nvgpu_kmalloc(g, sizeof(*priv)); |
433 | if (!priv) { | 433 | if (!priv) { |
diff --git a/drivers/gpu/nvgpu/gm20b/clk_gm20b.c b/drivers/gpu/nvgpu/gm20b/clk_gm20b.c index 07b5d454..d6eec0a5 100644 --- a/drivers/gpu/nvgpu/gm20b/clk_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/clk_gm20b.c | |||
@@ -1619,7 +1619,7 @@ static int pll_reg_show(struct seq_file *s, void *data) | |||
1619 | nvgpu_mutex_acquire(&g->clk.clk_mutex); | 1619 | nvgpu_mutex_acquire(&g->clk.clk_mutex); |
1620 | if (!g->clk.clk_hw_on) { | 1620 | if (!g->clk.clk_hw_on) { |
1621 | seq_printf(s, "%s powered down - no access to registers\n", | 1621 | seq_printf(s, "%s powered down - no access to registers\n", |
1622 | dev_name(dev_from_gk20a(g))); | 1622 | g->name); |
1623 | nvgpu_mutex_release(&g->clk.clk_mutex); | 1623 | nvgpu_mutex_release(&g->clk.clk_mutex); |
1624 | return 0; | 1624 | return 0; |
1625 | } | 1625 | } |
@@ -1666,7 +1666,7 @@ static int pll_reg_raw_show(struct seq_file *s, void *data) | |||
1666 | nvgpu_mutex_acquire(&g->clk.clk_mutex); | 1666 | nvgpu_mutex_acquire(&g->clk.clk_mutex); |
1667 | if (!g->clk.clk_hw_on) { | 1667 | if (!g->clk.clk_hw_on) { |
1668 | seq_printf(s, "%s powered down - no access to registers\n", | 1668 | seq_printf(s, "%s powered down - no access to registers\n", |
1669 | dev_name(dev_from_gk20a(g))); | 1669 | g->name); |
1670 | nvgpu_mutex_release(&g->clk.clk_mutex); | 1670 | nvgpu_mutex_release(&g->clk.clk_mutex); |
1671 | return 0; | 1671 | return 0; |
1672 | } | 1672 | } |
diff --git a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c index 684f5731..5e19a5ae 100644 --- a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c | |||
@@ -237,7 +237,7 @@ int gm20b_init_hal(struct gk20a *g) | |||
237 | #if defined(CONFIG_GK20A_CYCLE_STATS) | 237 | #if defined(CONFIG_GK20A_CYCLE_STATS) |
238 | gk20a_init_css_ops(gops); | 238 | gk20a_init_css_ops(gops); |
239 | #endif | 239 | #endif |
240 | gops->name = "gm20b"; | 240 | g->name = "gm20b"; |
241 | gops->chip_init_gpu_characteristics = gk20a_init_gpu_characteristics; | 241 | gops->chip_init_gpu_characteristics = gk20a_init_gpu_characteristics; |
242 | gops->get_litter_value = gm20b_get_litter_value; | 242 | gops->get_litter_value = gm20b_get_litter_value; |
243 | 243 | ||
diff --git a/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c b/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c index 8c1be1d1..a2c46600 100644 --- a/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c | |||
@@ -115,7 +115,7 @@ int gm20b_ltc_cbc_ctrl(struct gk20a *g, enum gk20a_cbc_op op, | |||
115 | 115 | ||
116 | gk20a_dbg_fn(""); | 116 | gk20a_dbg_fn(""); |
117 | 117 | ||
118 | trace_gk20a_ltc_cbc_ctrl_start(dev_name(g->dev), op, min, max); | 118 | trace_gk20a_ltc_cbc_ctrl_start(g->name, op, min, max); |
119 | 119 | ||
120 | if (gr->compbit_store.mem.size == 0) | 120 | if (gr->compbit_store.mem.size == 0) |
121 | return 0; | 121 | return 0; |
@@ -162,7 +162,7 @@ int gm20b_ltc_cbc_ctrl(struct gk20a *g, enum gk20a_cbc_op op, | |||
162 | } | 162 | } |
163 | } | 163 | } |
164 | out: | 164 | out: |
165 | trace_gk20a_ltc_cbc_ctrl_done(dev_name(g->dev)); | 165 | trace_gk20a_ltc_cbc_ctrl_done(g->name); |
166 | nvgpu_mutex_release(&g->mm.l2_op_lock); | 166 | nvgpu_mutex_release(&g->mm.l2_op_lock); |
167 | return err; | 167 | return err; |
168 | } | 168 | } |
diff --git a/drivers/gpu/nvgpu/gp106/hal_gp106.c b/drivers/gpu/nvgpu/gp106/hal_gp106.c index 36f72b12..e049a9f9 100644 --- a/drivers/gpu/nvgpu/gp106/hal_gp106.c +++ b/drivers/gpu/nvgpu/gp106/hal_gp106.c | |||
@@ -249,7 +249,7 @@ int gp106_init_hal(struct gk20a *g) | |||
249 | gp106_init_therm_ops(gops); | 249 | gp106_init_therm_ops(gops); |
250 | gp106_init_xve_ops(gops); | 250 | gp106_init_xve_ops(gops); |
251 | 251 | ||
252 | gops->name = "gp10x"; | 252 | g->name = "gp10x"; |
253 | gops->get_litter_value = gp106_get_litter_value; | 253 | gops->get_litter_value = gp106_get_litter_value; |
254 | gops->chip_init_gpu_characteristics = gp106_init_gpu_characteristics; | 254 | gops->chip_init_gpu_characteristics = gp106_init_gpu_characteristics; |
255 | gops->gr_ctx.use_dma_for_fw_bootstrap = true; | 255 | gops->gr_ctx.use_dma_for_fw_bootstrap = true; |
diff --git a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c index 245d2d26..e9272a55 100644 --- a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c | |||
@@ -253,7 +253,7 @@ int gp10b_init_hal(struct gk20a *g) | |||
253 | #if defined(CONFIG_GK20A_CYCLE_STATS) | 253 | #if defined(CONFIG_GK20A_CYCLE_STATS) |
254 | gk20a_init_css_ops(gops); | 254 | gk20a_init_css_ops(gops); |
255 | #endif | 255 | #endif |
256 | gops->name = "gp10b"; | 256 | g->name = "gp10b"; |
257 | gops->chip_init_gpu_characteristics = gp10b_init_gpu_characteristics; | 257 | gops->chip_init_gpu_characteristics = gp10b_init_gpu_characteristics; |
258 | gops->get_litter_value = gp10b_get_litter_value; | 258 | gops->get_litter_value = gp10b_get_litter_value; |
259 | 259 | ||