diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gm20b')
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/acr_gm20b.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/clk_gm20b.c | 4 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/ltc_gm20b.c | 8 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/mm_gm20b.c | 6 |
4 files changed, 10 insertions, 10 deletions
diff --git a/drivers/gpu/nvgpu/gm20b/acr_gm20b.c b/drivers/gpu/nvgpu/gm20b/acr_gm20b.c index 8a0be106..79f90f0b 100644 --- a/drivers/gpu/nvgpu/gm20b/acr_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/acr_gm20b.c | |||
@@ -1257,7 +1257,7 @@ static int gm20b_init_pmu_setup_hw1(struct gk20a *g, | |||
1257 | 1257 | ||
1258 | struct pmu_gk20a *pmu = &g->pmu; | 1258 | struct pmu_gk20a *pmu = &g->pmu; |
1259 | int err; | 1259 | int err; |
1260 | struct gk20a_platform *platform = platform_get_drvdata(g->dev); | 1260 | struct gk20a_platform *platform = dev_get_drvdata(g->dev); |
1261 | 1261 | ||
1262 | gk20a_dbg_fn(""); | 1262 | gk20a_dbg_fn(""); |
1263 | 1263 | ||
diff --git a/drivers/gpu/nvgpu/gm20b/clk_gm20b.c b/drivers/gpu/nvgpu/gm20b/clk_gm20b.c index 16f929a8..54406008 100644 --- a/drivers/gpu/nvgpu/gm20b/clk_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/clk_gm20b.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * GM20B Clocks | 2 | * GM20B Clocks |
3 | * | 3 | * |
4 | * Copyright (c) 2014, NVIDIA CORPORATION. All rights reserved. | 4 | * Copyright (c) 2014-2016, NVIDIA CORPORATION. All rights reserved. |
5 | * | 5 | * |
6 | * This program is free software; you can redistribute it and/or modify it | 6 | * This program is free software; you can redistribute it and/or modify it |
7 | * under the terms and conditions of the GNU General Public License, | 7 | * under the terms and conditions of the GNU General Public License, |
@@ -1651,7 +1651,7 @@ static const struct file_operations pll_param_fops = { | |||
1651 | static int clk_gm20b_debugfs_init(struct gk20a *g) | 1651 | static int clk_gm20b_debugfs_init(struct gk20a *g) |
1652 | { | 1652 | { |
1653 | struct dentry *d; | 1653 | struct dentry *d; |
1654 | struct gk20a_platform *platform = platform_get_drvdata(g->dev); | 1654 | struct gk20a_platform *platform = dev_get_drvdata(g->dev); |
1655 | 1655 | ||
1656 | d = debugfs_create_file( | 1656 | d = debugfs_create_file( |
1657 | "rate", S_IRUGO|S_IWUSR, platform->debugfs, g, &rate_fops); | 1657 | "rate", S_IRUGO|S_IWUSR, platform->debugfs, g, &rate_fops); |
diff --git a/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c b/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c index ffc36903..e4e27764 100644 --- a/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c | |||
@@ -112,7 +112,7 @@ int gm20b_ltc_cbc_ctrl(struct gk20a *g, enum gk20a_cbc_op op, | |||
112 | 112 | ||
113 | gk20a_dbg_fn(""); | 113 | gk20a_dbg_fn(""); |
114 | 114 | ||
115 | trace_gk20a_ltc_cbc_ctrl_start(g->dev->name, op, min, max); | 115 | trace_gk20a_ltc_cbc_ctrl_start(dev_name(g->dev), op, min, max); |
116 | 116 | ||
117 | if (gr->compbit_store.mem.size == 0) | 117 | if (gr->compbit_store.mem.size == 0) |
118 | return 0; | 118 | 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(g->dev->name); | 165 | trace_gk20a_ltc_cbc_ctrl_done(dev_name(g->dev)); |
166 | mutex_unlock(&g->mm.l2_op_lock); | 166 | mutex_unlock(&g->mm.l2_op_lock); |
167 | return err; | 167 | return err; |
168 | } | 168 | } |
@@ -230,7 +230,7 @@ void gm20b_ltc_g_elpg_flush_locked(struct gk20a *g) | |||
230 | 230 | ||
231 | gk20a_dbg_fn(""); | 231 | gk20a_dbg_fn(""); |
232 | 232 | ||
233 | trace_gk20a_mm_g_elpg_flush_locked(g->dev->name); | 233 | trace_gk20a_mm_g_elpg_flush_locked(dev_name(g->dev)); |
234 | 234 | ||
235 | for (i = 0; i < g->ltc_count; i++) | 235 | for (i = 0; i < g->ltc_count; i++) |
236 | done[i] = 0; | 236 | done[i] = 0; |
@@ -264,7 +264,7 @@ void gm20b_ltc_g_elpg_flush_locked(struct gk20a *g) | |||
264 | gk20a_warn(dev_from_gk20a(g), | 264 | gk20a_warn(dev_from_gk20a(g), |
265 | "g_elpg_flush too many retries"); | 265 | "g_elpg_flush too many retries"); |
266 | 266 | ||
267 | trace_gk20a_mm_g_elpg_flush_locked_done(g->dev->name); | 267 | trace_gk20a_mm_g_elpg_flush_locked_done(dev_name(g->dev)); |
268 | } | 268 | } |
269 | 269 | ||
270 | u32 gm20b_ltc_cbc_fix_config(struct gk20a *g, int base) | 270 | u32 gm20b_ltc_cbc_fix_config(struct gk20a *g, int base) |
diff --git a/drivers/gpu/nvgpu/gm20b/mm_gm20b.c b/drivers/gpu/nvgpu/gm20b/mm_gm20b.c index 621ee687..7bc19972 100644 --- a/drivers/gpu/nvgpu/gm20b/mm_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/mm_gm20b.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * GM20B MMU | 2 | * GM20B MMU |
3 | * | 3 | * |
4 | * Copyright (c) 2014-2015, NVIDIA CORPORATION. All rights reserved. | 4 | * Copyright (c) 2014-2016, NVIDIA CORPORATION. All rights reserved. |
5 | * | 5 | * |
6 | * This program is free software; you can redistribute it and/or modify it | 6 | * This program is free software; you can redistribute it and/or modify it |
7 | * under the terms and conditions of the GNU General Public License, | 7 | * under the terms and conditions of the GNU General Public License, |
@@ -52,7 +52,7 @@ int gm20b_mm_mmu_vpr_info_fetch(struct gk20a *g) | |||
52 | 52 | ||
53 | gk20a_busy_noresume(g->dev); | 53 | gk20a_busy_noresume(g->dev); |
54 | #ifdef CONFIG_PM | 54 | #ifdef CONFIG_PM |
55 | if (!pm_runtime_active(&g->dev->dev)) | 55 | if (!pm_runtime_active(g->dev)) |
56 | goto fail; | 56 | goto fail; |
57 | #endif | 57 | #endif |
58 | 58 | ||
@@ -67,7 +67,7 @@ int gm20b_mm_mmu_vpr_info_fetch(struct gk20a *g) | |||
67 | ret = gm20b_mm_mmu_vpr_info_fetch_wait(g, VPR_INFO_FETCH_WAIT); | 67 | ret = gm20b_mm_mmu_vpr_info_fetch_wait(g, VPR_INFO_FETCH_WAIT); |
68 | 68 | ||
69 | fail: | 69 | fail: |
70 | pm_runtime_put(&g->dev->dev); | 70 | pm_runtime_put(g->dev); |
71 | return ret; | 71 | return ret; |
72 | } | 72 | } |
73 | 73 | ||