diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gm20b')
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/clk_gm20b.c | 4 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/hal_gm20b.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/ltc_gm20b.c | 4 |
3 files changed, 5 insertions, 5 deletions
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 | } |