From 3e39798997f0726472e18a17462216094c084074 Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Fri, 24 Mar 2017 10:55:46 -0700 Subject: gpu: nvgpu: Remove unnecessary use of dev_name() Move the name field from struct gpu_ops up to struct gk20a. The field is not a function op, so it doesn't belong in gpu_ops. Replace all uses of dev_name() with use of g->name when possible. JIRA NVGPU-16 Change-Id: Ic6e99e39258cbf3bb7c806962cbbd7de5126688f Signed-off-by: Terje Bergstrom Reviewed-on: http://git-master/r/1328534 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/clk/clk_arb.c | 2 +- drivers/gpu/nvgpu/common/nvgpu_common.c | 4 ++-- drivers/gpu/nvgpu/gk20a/as_gk20a.c | 16 ++++++++-------- drivers/gpu/nvgpu/gk20a/channel_gk20a.c | 16 ++++++++-------- drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c | 2 +- drivers/gpu/nvgpu/gk20a/ctrl_gk20a.c | 6 ++---- drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c | 28 ++++++++++++++-------------- drivers/gpu/nvgpu/gk20a/fb_gk20a.c | 4 ++-- drivers/gpu/nvgpu/gk20a/fifo_gk20a.c | 6 +++--- drivers/gpu/nvgpu/gk20a/gk20a.c | 12 ++++++------ drivers/gpu/nvgpu/gk20a/gk20a.h | 3 ++- drivers/gpu/nvgpu/gk20a/gr_gk20a.c | 2 +- drivers/gpu/nvgpu/gk20a/hal_gk20a.c | 2 +- drivers/gpu/nvgpu/gk20a/ltc_gk20a.c | 4 ++-- drivers/gpu/nvgpu/gk20a/mc_gk20a.c | 8 ++++---- drivers/gpu/nvgpu/gk20a/mm_gk20a.c | 12 ++++++------ drivers/gpu/nvgpu/gk20a/tsg_gk20a.c | 2 +- drivers/gpu/nvgpu/gm20b/clk_gm20b.c | 4 ++-- drivers/gpu/nvgpu/gm20b/hal_gm20b.c | 2 +- drivers/gpu/nvgpu/gm20b/ltc_gm20b.c | 4 ++-- drivers/gpu/nvgpu/gp106/hal_gp106.c | 2 +- drivers/gpu/nvgpu/gp10b/hal_gp10b.c | 2 +- 22 files changed, 71 insertions(+), 72 deletions(-) (limited to 'drivers/gpu') 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, goto fail; } - snprintf(name, sizeof(name), "%s-clk-fd%d", dev_name(g->dev), fd); + snprintf(name, sizeof(name), "%s-clk-fd%d", g->name, fd); file = anon_inode_getfile(name, fops, dev, O_RDWR); if (IS_ERR(file)) { 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, if (!current->fs || !fw_name) return NULL; - BUG_ON(!g->ops.name); - fw = do_request_firmware(dev, g->ops.name, fw_name, flags); + BUG_ON(!g->name); + fw = do_request_firmware(dev, g->name, fw_name, flags); #ifdef CONFIG_TEGRA_GK20A /* 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) switch (cmd) { case NVGPU_AS_IOCTL_BIND_CHANNEL: - trace_gk20a_as_ioctl_bind_channel(dev_name(dev_from_gk20a(g))); + trace_gk20a_as_ioctl_bind_channel(g->name); err = gk20a_as_ioctl_bind_channel(as_share, (struct nvgpu_as_bind_channel_args *)buf); @@ -396,38 +396,38 @@ long gk20a_as_dev_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) args.page_size = args32->page_size; args.flags = args32->flags; args.o_a.offset = args32->o_a.offset; - trace_gk20a_as_ioctl_alloc_space(dev_name(dev_from_gk20a(g))); + trace_gk20a_as_ioctl_alloc_space(g->name); err = gk20a_as_ioctl_alloc_space(as_share, &args); args32->o_a.offset = args.o_a.offset; break; } case NVGPU_AS_IOCTL_ALLOC_SPACE: - trace_gk20a_as_ioctl_alloc_space(dev_name(dev_from_gk20a(g))); + trace_gk20a_as_ioctl_alloc_space(g->name); err = gk20a_as_ioctl_alloc_space(as_share, (struct nvgpu_as_alloc_space_args *)buf); break; case NVGPU_AS_IOCTL_FREE_SPACE: - trace_gk20a_as_ioctl_free_space(dev_name(dev_from_gk20a(g))); + trace_gk20a_as_ioctl_free_space(g->name); err = gk20a_as_ioctl_free_space(as_share, (struct nvgpu_as_free_space_args *)buf); break; case NVGPU_AS_IOCTL_MAP_BUFFER: - trace_gk20a_as_ioctl_map_buffer(dev_name(dev_from_gk20a(g))); + trace_gk20a_as_ioctl_map_buffer(g->name); err = gk20a_as_ioctl_map_buffer(as_share, (struct nvgpu_as_map_buffer_args *)buf); break; case NVGPU_AS_IOCTL_MAP_BUFFER_EX: - trace_gk20a_as_ioctl_map_buffer(dev_name(dev_from_gk20a(g))); + trace_gk20a_as_ioctl_map_buffer(g->name); err = gk20a_as_ioctl_map_buffer_ex(as_share, (struct nvgpu_as_map_buffer_ex_args *)buf); break; case NVGPU_AS_IOCTL_UNMAP_BUFFER: - trace_gk20a_as_ioctl_unmap_buffer(dev_name(dev_from_gk20a(g))); + trace_gk20a_as_ioctl_unmap_buffer(g->name); err = gk20a_as_ioctl_unmap_buffer(as_share, (struct nvgpu_as_unmap_buffer_args *)buf); break; case NVGPU_AS_IOCTL_GET_VA_REGIONS: - trace_gk20a_as_ioctl_get_va_regions(dev_name(dev_from_gk20a(g))); + trace_gk20a_as_ioctl_get_va_regions(g->name); err = gk20a_as_ioctl_get_va_regions(as_share, (struct nvgpu_as_get_va_regions_args *)buf); 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) goto channel_release; } - trace_gk20a_channel_release(dev_name(g->dev)); + trace_gk20a_channel_release(g->name); gk20a_channel_close(ch); gk20a_idle(g); @@ -1396,7 +1396,7 @@ static int __gk20a_channel_open(struct gk20a *g, struct file *filp, s32 runlist_ if (!g) return -ENODEV; - trace_gk20a_channel_open(dev_name(g->dev)); + trace_gk20a_channel_open(g->name); priv = nvgpu_kzalloc(g, sizeof(*priv)); if (!priv) { @@ -1463,7 +1463,7 @@ int gk20a_channel_open_ioctl(struct gk20a *g, fd = err; snprintf(name, sizeof(name), "nvhost-%s-fd%d", - dev_name(g->dev), fd); + g->name, fd); file = anon_inode_getfile(name, g->channel.cdev.ops, NULL, O_RDWR); if (IS_ERR(file)) { @@ -2041,7 +2041,7 @@ static void trace_write_pushbuffer(struct channel_gk20a *c, */ for (i = 0; i < words; i += 128U) { trace_gk20a_push_cmdbuf( - dev_name(c->g->dev), + c->g->name, 0, min(words - i, 128U), offset + i * sizeof(u32), @@ -2442,7 +2442,7 @@ int nvgpu_channel_worker_init(struct gk20a *g) INIT_LIST_HEAD(&g->channel_worker.items); nvgpu_spinlock_init(&g->channel_worker.items_lock); task = kthread_run(gk20a_channel_poll_worker, g, - "nvgpu_channel_poll_%s", dev_name(g->dev)); + "nvgpu_channel_poll_%s", g->name); if (IS_ERR(task)) { gk20a_err(g->dev, "failed to start channel poller thread"); return PTR_ERR(task); @@ -2753,7 +2753,7 @@ static void gk20a_submit_append_priv_cmdbuf(struct channel_gk20a *c, &x, sizeof(x)); if (cmd->mem->aperture == APERTURE_SYSMEM) - trace_gk20a_push_cmdbuf(dev_name(g->dev), 0, cmd->size, 0, + trace_gk20a_push_cmdbuf(g->name, 0, cmd->size, 0, cmd->mem->cpu_va + cmd->off * sizeof(u32)); 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, } } - trace_gk20a_channel_submit_gpfifo(dev_name(c->g->dev), + trace_gk20a_channel_submit_gpfifo(g->name, c->hw_chid, num_entries, flags, @@ -3219,7 +3219,7 @@ int gk20a_submit_channel_gpfifo(struct channel_gk20a *c, g->ops.fifo.userd_gp_put(g, c); - trace_gk20a_channel_submitted_gpfifo(dev_name(c->g->dev), + trace_gk20a_channel_submitted_gpfifo(g->name, c->hw_chid, num_entries, 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) sp->host1x_pdev = c->g->host1x_dev; snprintf(syncpt_name, sizeof(syncpt_name), - "%s_%d", dev_name(c->g->dev), c->hw_chid); + "%s_%d", c->g->name, c->hw_chid); sp->id = nvhost_get_syncpt_host_managed(sp->host1x_pdev, 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( struct gk20a *g, struct nvgpu_alloc_as_args *args) { - struct device *dev = g->dev; struct gk20a_as_share *as_share; int err; int fd; @@ -211,7 +210,7 @@ static int gk20a_ctrl_alloc_as( fd = err; name = kasprintf(GFP_KERNEL, "nvhost-%s-fd%d", - dev_name(dev), fd); + g->name, fd); file = anon_inode_getfile(name, g->as.cdev.ops, NULL, O_RDWR); kfree(name); @@ -241,7 +240,6 @@ clean_up: static int gk20a_ctrl_open_tsg(struct gk20a *g, struct nvgpu_gpu_open_tsg_args *args) { - struct device *dev = g->dev; int err; int fd; struct file *file; @@ -253,7 +251,7 @@ static int gk20a_ctrl_open_tsg(struct gk20a *g, fd = err; name = kasprintf(GFP_KERNEL, "nvgpu-%s-tsg%d", - dev_name(dev), fd); + g->name, fd); file = anon_inode_getfile(name, g->tsg.cdev.ops, NULL, O_RDWR); 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, dev = g->dev; - gk20a_dbg(gpu_dbg_fn | gpu_dbg_gpu_dbg, "dbg session: %s", dev_name(dev)); + gk20a_dbg(gpu_dbg_fn | gpu_dbg_gpu_dbg, "dbg session: %s", g->name); err = alloc_session(&dbg_session); if (err) @@ -476,7 +476,7 @@ static int dbg_unbind_channel_gk20a(struct dbg_session_gk20a *dbg_s, int err; gk20a_dbg(gpu_dbg_fn|gpu_dbg_gpu_dbg, "%s fd=%d", - dev_name(dbg_s->dev), args->channel_fd); + g->name, args->channel_fd); ch = gk20a_get_channel_from_file(args->channel_fd); if (!ch) { @@ -513,7 +513,7 @@ int gk20a_dbg_gpu_dev_release(struct inode *inode, struct file *filp) struct gk20a *g = dbg_s->g; struct dbg_profiler_object_data *prof_obj, *tmp_obj; - gk20a_dbg(gpu_dbg_gpu_dbg | gpu_dbg_fn, "%s", dev_name(dbg_s->dev)); + gk20a_dbg(gpu_dbg_gpu_dbg | gpu_dbg_fn, "%s", g->name); /* unbind channels */ dbg_unbind_all_channels_gk20a(dbg_s); @@ -561,7 +561,7 @@ static int dbg_bind_channel_gk20a(struct dbg_session_gk20a *dbg_s, struct dbg_session_data *session_data; gk20a_dbg(gpu_dbg_fn|gpu_dbg_gpu_dbg, "%s fd=%d", - dev_name(dbg_s->dev), args->channel_fd); + g->name, args->channel_fd); /* even though get_file_channel is doing this it releases it as well */ /* 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, return -EINVAL; } - gk20a_dbg_fn("%s hwchid=%d", dev_name(dbg_s->dev), ch->hw_chid); + gk20a_dbg_fn("%s hwchid=%d", g->name, ch->hw_chid); nvgpu_mutex_acquire(&g->dbg_sessions_lock); nvgpu_mutex_acquire(&ch->dbg_s_lock); @@ -1262,7 +1262,7 @@ static int dbg_set_powergate(struct dbg_session_gk20a *dbg_s, u32 powermode) /* This function must be called with g->dbg_sessions_lock held */ gk20a_dbg(gpu_dbg_fn|gpu_dbg_gpu_dbg, "%s powergate mode = %d", - dev_name(dbg_s->dev), powermode); + g->name, powermode); switch (powermode) { case NVGPU_DBG_GPU_POWERGATE_MODE_DISABLE: @@ -1352,7 +1352,7 @@ static int dbg_set_powergate(struct dbg_session_gk20a *dbg_s, u32 powermode) } gk20a_dbg(gpu_dbg_fn|gpu_dbg_gpu_dbg, "%s powergate mode = %d done", - dev_name(dbg_s->dev), powermode); + g->name, powermode); return err; } @@ -1362,7 +1362,7 @@ static int nvgpu_ioctl_powergate_gk20a(struct dbg_session_gk20a *dbg_s, int err; struct gk20a *g = dbg_s->g; gk20a_dbg_fn("%s powergate mode = %d", - dev_name(dbg_s->dev), args->mode); + g->name, args->mode); nvgpu_mutex_acquire(&g->dbg_sessions_lock); 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, struct channel_gk20a *ch_gk20a; gk20a_dbg_fn("%s smpc ctxsw mode = %d", - dev_name(dbg_s->dev), args->mode); + g->name, args->mode); err = gk20a_busy(g); if (err) { @@ -1420,7 +1420,7 @@ static int nvgpu_dbg_gpu_ioctl_hwpm_ctxsw_mode(struct dbg_session_gk20a *dbg_s, struct channel_gk20a *ch_gk20a; gk20a_dbg_fn("%s pm ctxsw mode = %d", - dev_name(dbg_s->dev), args->mode); + g->name, args->mode); /* Must have a valid reservation to enable/disable hwpm cxtsw. * Just print an error message for now, but eventually this should @@ -1523,7 +1523,7 @@ static int nvgpu_ioctl_allocate_profiler_object( struct gk20a *g = get_gk20a(dbg_s->dev); struct dbg_profiler_object_data *prof_obj; - gk20a_dbg_fn("%s", dev_name(dbg_s->dev)); + gk20a_dbg_fn("%s", g->name); nvgpu_mutex_acquire(&g->dbg_sessions_lock); @@ -1567,7 +1567,7 @@ static int nvgpu_ioctl_free_profiler_object( bool obj_found = false; gk20a_dbg_fn("%s session_id = %d profiler_handle = %x", - dev_name(dbg_s->dev), dbg_s->id, args->profiler_handle); + g->name, dbg_s->id, args->profiler_handle); nvgpu_mutex_acquire(&g->dbg_sessions_lock); @@ -1674,7 +1674,7 @@ static int nvgpu_profiler_reserve_acquire(struct dbg_session_gk20a *dbg_s, struct dbg_profiler_object_data *prof_obj, *my_prof_obj; int err = 0; - gk20a_dbg_fn("%s profiler_handle = %x", dev_name(dbg_s->dev), profiler_handle); + gk20a_dbg_fn("%s profiler_handle = %x", g->name, profiler_handle); if (g->profiler_reservation_count < 0) { 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, struct dbg_profiler_object_data *prof_obj; int err = 0; - gk20a_dbg_fn("%s profiler_handle = %x", dev_name(dbg_s->dev), profiler_handle); + gk20a_dbg_fn("%s profiler_handle = %x", g->name, profiler_handle); nvgpu_mutex_acquire(&g->dbg_sessions_lock); 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) nvgpu_mutex_acquire(&g->mm.tlb_lock); - trace_gk20a_mm_tlb_invalidate(dev_name(g->dev)); + trace_gk20a_mm_tlb_invalidate(g->name); nvgpu_timeout_init(g, &timeout, 1000, NVGPU_TIMER_RETRY_TIMER); @@ -153,7 +153,7 @@ void gk20a_fb_tlb_invalidate(struct gk20a *g, struct mem_desc *pdb) } while (!nvgpu_timeout_expired_msg(&timeout, "wait mmu invalidate")); - trace_gk20a_mm_tlb_invalidate_done(dev_name(g->dev)); + trace_gk20a_mm_tlb_invalidate_done(g->name); out: 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, syncpointb = inst_mem[ram_fc_syncpointb_w()]; gk20a_debug_output(o, "%d-%s, pid %d, refs: %d: ", hw_chid, - dev_name(g->dev), + g->name, ch_state->pid, ch_state->refs); gk20a_debug_output(o, "channel status: %s in use %s %s\n", @@ -3799,7 +3799,7 @@ void gk20a_dump_pbdma_status(struct gk20a *g, u32 status = gk20a_readl(g, fifo_pbdma_status_r(i)); u32 chan_status = fifo_pbdma_status_chan_status_v(status); - gk20a_debug_output(o, "%s pbdma %d: ", dev_name(g->dev), i); + gk20a_debug_output(o, "%s pbdma %d: ", g->name, i); gk20a_debug_output(o, "id: %d (%s), next_id: %d (%s) chan status: %s\n", fifo_pbdma_status_id_v(status), @@ -3832,7 +3832,7 @@ void gk20a_dump_eng_status(struct gk20a *g, u32 status = gk20a_readl(g, fifo_engine_status_r(i)); u32 ctx_status = fifo_engine_status_ctx_status_v(status); - gk20a_debug_output(o, "%s eng %d: ", dev_name(g->dev), i); + gk20a_debug_output(o, "%s eng %d: ", g->name, i); gk20a_debug_output(o, "id: %d (%s), next_id: %d (%s), ctx status: %s ", 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) if (g->power_on) return 0; - trace_gk20a_finalize_poweron(dev_name(dev)); + trace_gk20a_finalize_poweron(g->name); /* Increment platform power refcount */ if (platform->busy) { @@ -687,7 +687,7 @@ int gk20a_pm_finalize_poweron(struct device *dev) gk20a_scale_resume(dev); - trace_gk20a_finalize_poweron_done(dev_name(dev)); + trace_gk20a_finalize_poweron_done(g->name); if (platform->has_cde) gk20a_init_cde_support(g); @@ -793,8 +793,8 @@ static int gk20a_create_device( if (IS_ERR(subdev)) { err = PTR_ERR(dev); cdev_del(cdev); - dev_err(dev, "failed to create %s device for %s\n", - cdev_name, dev_name(dev)); + dev_err(dev, "failed to create %s device\n", + cdev_name); return err; } @@ -971,7 +971,7 @@ static int gk20a_pm_unrailgate(struct device *dev) g->pstats.railgating_cycle_count++; #endif - trace_gk20a_pm_unrailgate(dev_name(dev)); + trace_gk20a_pm_unrailgate(g->name); if (platform->unrailgate) { nvgpu_mutex_acquire(&platform->railgate_lock); @@ -1765,7 +1765,7 @@ int gk20a_init_gpu_characteristics(struct gk20a *g) gpu->event_ioctl_nr_last = NVGPU_EVENT_IOCTL_LAST; gpu->gpu_va_bit_count = 40; - strlcpy(gpu->chipname, g->ops.name, sizeof(gpu->chipname)); + strlcpy(gpu->chipname, g->name, sizeof(gpu->chipname)); gpu->max_fbps_count = g->ops.gr.get_max_fbps_count(g); gpu->fbp_en_mask = g->ops.gr.get_fbp_en_mask(g); 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 { void (*init_elcg_mode)(struct gk20a *g, u32 mode, u32 engine); void (*load_tpc_mask)(struct gk20a *g); } gr; - const char *name; struct { void (*init_hw)(struct gk20a *g); void (*init_fs_state)(struct gk20a *g); @@ -895,6 +894,8 @@ struct gk20a { void __iomem *bar1; void __iomem *bar1_saved; + const char *name; + bool gpu_reset_done; bool power_on; 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, { gk20a_dbg_fn(""); - trace_gr_gk20a_handle_sw_method(dev_name(g->dev)); + trace_gr_gk20a_handle_sw_method(g->name); if (class_num == KEPLER_COMPUTE_A) { 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) #if defined(CONFIG_GK20A_CYCLE_STATS) gk20a_init_css_ops(gops); #endif - gops->name = "gk20a"; + g->name = "gk20a"; gops->chip_init_gpu_characteristics = gk20a_init_gpu_characteristics; gops->get_litter_value = gk20a_get_litter_value; 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, gk20a_dbg_fn(""); - trace_gk20a_ltc_cbc_ctrl_start(dev_name(g->dev), op, min, max); + trace_gk20a_ltc_cbc_ctrl_start(g->name, op, min, max); if (gr->compbit_store.mem.size == 0) return 0; @@ -168,7 +168,7 @@ static int gk20a_ltc_cbc_ctrl(struct gk20a *g, enum gk20a_cbc_op op, } } out: - trace_gk20a_ltc_cbc_ctrl_done(dev_name(g->dev)); + trace_gk20a_ltc_cbc_ctrl_done(g->name); nvgpu_mutex_release(&g->mm.l2_op_lock); return err; } 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) { u32 mc_intr_0; - trace_mc_gk20a_intr_stall(dev_name(g->dev)); + trace_mc_gk20a_intr_stall(g->name); if (!g->power_on) return IRQ_NONE; @@ -62,7 +62,7 @@ irqreturn_t mc_gk20a_isr_stall(struct gk20a *g) atomic_inc(&g->hw_irq_stall_count); - trace_mc_gk20a_intr_stall_done(dev_name(g->dev)); + trace_mc_gk20a_intr_stall_done(g->name); return IRQ_WAKE_THREAD; } @@ -115,7 +115,7 @@ irqreturn_t mc_gk20a_intr_thread_stall(struct gk20a *g) gk20a_dbg(gpu_dbg_intr, "interrupt thread launched"); - trace_mc_gk20a_intr_thread_stall(dev_name(g->dev)); + trace_mc_gk20a_intr_thread_stall(g->name); mc_intr_0 = gk20a_readl(g, mc_intr_0_r()); hw_irq_count = atomic_read(&g->hw_irq_stall_count); @@ -164,7 +164,7 @@ irqreturn_t mc_gk20a_intr_thread_stall(struct gk20a *g) wake_up_all(&g->sw_irq_stall_last_handled_wq); - trace_mc_gk20a_intr_thread_stall_done(dev_name(g->dev)); + trace_mc_gk20a_intr_thread_stall_done(g->name); return IRQ_HANDLED; } 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) guarantee that writes are to DRAM. This will be a sysmembar internal to the L2. */ - trace_gk20a_mm_fb_flush(dev_name(g->dev)); + trace_gk20a_mm_fb_flush(g->name); gk20a_writel(g, flush_fb_flush_r(), flush_fb_flush_pending_busy_f()); @@ -5170,7 +5170,7 @@ int gk20a_mm_fb_flush(struct gk20a *g) ret = -EBUSY; } - trace_gk20a_mm_fb_flush_done(dev_name(g->dev)); + trace_gk20a_mm_fb_flush_done(g->name); nvgpu_mutex_release(&mm->l2_op_lock); @@ -5184,7 +5184,7 @@ static void gk20a_mm_l2_invalidate_locked(struct gk20a *g) u32 data; struct nvgpu_timeout timeout; - trace_gk20a_mm_l2_invalidate(dev_name(g->dev)); + trace_gk20a_mm_l2_invalidate(g->name); nvgpu_timeout_init(g, &timeout, 200, NVGPU_TIMER_RETRY_TIMER); @@ -5211,7 +5211,7 @@ static void gk20a_mm_l2_invalidate_locked(struct gk20a *g) gk20a_warn(dev_from_gk20a(g), "l2_system_invalidate too many retries"); - trace_gk20a_mm_l2_invalidate_done(dev_name(g->dev)); + trace_gk20a_mm_l2_invalidate_done(g->name); } void gk20a_mm_l2_invalidate(struct gk20a *g) @@ -5242,7 +5242,7 @@ void gk20a_mm_l2_flush(struct gk20a *g, bool invalidate) nvgpu_mutex_acquire(&mm->l2_op_lock); - trace_gk20a_mm_l2_flush(dev_name(g->dev)); + trace_gk20a_mm_l2_flush(g->name); /* Flush all dirty lines from the L2 to DRAM. Lines are left in the L2 as clean, so subsequent reads might hit in the L2. */ @@ -5263,7 +5263,7 @@ void gk20a_mm_l2_flush(struct gk20a *g, bool invalidate) } while (!nvgpu_timeout_expired_msg(&timeout, "l2_flush_dirty too many retries")); - trace_gk20a_mm_l2_flush_done(dev_name(g->dev)); + trace_gk20a_mm_l2_flush_done(g->name); if (invalidate) 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) dev = dev_from_gk20a(g); - gk20a_dbg(gpu_dbg_fn, "tsg: %s", dev_name(dev)); + gk20a_dbg(gpu_dbg_fn, "tsg: %s", g->name); priv = nvgpu_kmalloc(g, sizeof(*priv)); 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) nvgpu_mutex_acquire(&g->clk.clk_mutex); if (!g->clk.clk_hw_on) { seq_printf(s, "%s powered down - no access to registers\n", - dev_name(dev_from_gk20a(g))); + g->name); nvgpu_mutex_release(&g->clk.clk_mutex); return 0; } @@ -1666,7 +1666,7 @@ static int pll_reg_raw_show(struct seq_file *s, void *data) nvgpu_mutex_acquire(&g->clk.clk_mutex); if (!g->clk.clk_hw_on) { seq_printf(s, "%s powered down - no access to registers\n", - dev_name(dev_from_gk20a(g))); + g->name); nvgpu_mutex_release(&g->clk.clk_mutex); return 0; } 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) #if defined(CONFIG_GK20A_CYCLE_STATS) gk20a_init_css_ops(gops); #endif - gops->name = "gm20b"; + g->name = "gm20b"; gops->chip_init_gpu_characteristics = gk20a_init_gpu_characteristics; gops->get_litter_value = gm20b_get_litter_value; 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, gk20a_dbg_fn(""); - trace_gk20a_ltc_cbc_ctrl_start(dev_name(g->dev), op, min, max); + trace_gk20a_ltc_cbc_ctrl_start(g->name, op, min, max); if (gr->compbit_store.mem.size == 0) return 0; @@ -162,7 +162,7 @@ int gm20b_ltc_cbc_ctrl(struct gk20a *g, enum gk20a_cbc_op op, } } out: - trace_gk20a_ltc_cbc_ctrl_done(dev_name(g->dev)); + trace_gk20a_ltc_cbc_ctrl_done(g->name); nvgpu_mutex_release(&g->mm.l2_op_lock); return err; } 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) gp106_init_therm_ops(gops); gp106_init_xve_ops(gops); - gops->name = "gp10x"; + g->name = "gp10x"; gops->get_litter_value = gp106_get_litter_value; gops->chip_init_gpu_characteristics = gp106_init_gpu_characteristics; 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) #if defined(CONFIG_GK20A_CYCLE_STATS) gk20a_init_css_ops(gops); #endif - gops->name = "gp10b"; + g->name = "gp10b"; gops->chip_init_gpu_characteristics = gp10b_init_gpu_characteristics; gops->get_litter_value = gp10b_get_litter_value; -- cgit v1.2.2