diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gm20b')
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/ltc_gm20b.c | 49 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/ltc_gm20b.h | 1 |
2 files changed, 0 insertions, 50 deletions
diff --git a/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c b/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c index 11258032..8c1be1d1 100644 --- a/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c | |||
@@ -221,54 +221,6 @@ void gm20b_ltc_isr(struct gk20a *g) | |||
221 | } | 221 | } |
222 | } | 222 | } |
223 | 223 | ||
224 | void gm20b_ltc_g_elpg_flush_locked(struct gk20a *g) | ||
225 | { | ||
226 | u32 data; | ||
227 | bool done[g->ltc_count]; | ||
228 | s32 retry = 100; | ||
229 | unsigned int i; | ||
230 | unsigned int num_done = 0; | ||
231 | u32 ltc_d = ltc_ltc1_ltss_g_elpg_r() - ltc_ltc0_ltss_g_elpg_r(); | ||
232 | |||
233 | gk20a_dbg_fn(""); | ||
234 | |||
235 | trace_gk20a_mm_g_elpg_flush_locked(dev_name(g->dev)); | ||
236 | |||
237 | for (i = 0; i < g->ltc_count; i++) | ||
238 | done[i] = 0; | ||
239 | |||
240 | gk20a_writel(g, ltc_ltcs_ltss_g_elpg_r(), | ||
241 | ltc_ltcs_ltss_g_elpg_flush_pending_f()); | ||
242 | do { | ||
243 | for (i = 0; i < g->ltc_count; i++) { | ||
244 | if (done[i]) | ||
245 | continue; | ||
246 | |||
247 | data = gk20a_readl(g, | ||
248 | ltc_ltc0_ltss_g_elpg_r() + ltc_d * i); | ||
249 | |||
250 | if (ltc_ltc0_ltss_g_elpg_flush_v(data)) { | ||
251 | gk20a_dbg_info("g_elpg_flush 0x%x", data); | ||
252 | } else { | ||
253 | done[i] = 1; | ||
254 | num_done++; | ||
255 | } | ||
256 | } | ||
257 | |||
258 | if (num_done < g->ltc_count) { | ||
259 | retry--; | ||
260 | udelay(5); | ||
261 | } else | ||
262 | break; | ||
263 | } while (retry >= 0 || !tegra_platform_is_silicon()); | ||
264 | |||
265 | if (retry < 0 && tegra_platform_is_silicon()) | ||
266 | gk20a_warn(dev_from_gk20a(g), | ||
267 | "g_elpg_flush too many retries"); | ||
268 | |||
269 | trace_gk20a_mm_g_elpg_flush_locked_done(dev_name(g->dev)); | ||
270 | } | ||
271 | |||
272 | u32 gm20b_ltc_cbc_fix_config(struct gk20a *g, int base) | 224 | u32 gm20b_ltc_cbc_fix_config(struct gk20a *g, int base) |
273 | { | 225 | { |
274 | u32 val = gk20a_readl(g, ltc_ltcs_ltss_cbc_num_active_ltcs_r()); | 226 | u32 val = gk20a_readl(g, ltc_ltcs_ltss_cbc_num_active_ltcs_r()); |
@@ -412,7 +364,6 @@ void gm20b_init_ltc(struct gpu_ops *gops) | |||
412 | gops->ltc.init_fs_state = gm20b_ltc_init_fs_state; | 364 | gops->ltc.init_fs_state = gm20b_ltc_init_fs_state; |
413 | gops->ltc.init_comptags = gm20b_ltc_init_comptags; | 365 | gops->ltc.init_comptags = gm20b_ltc_init_comptags; |
414 | gops->ltc.cbc_ctrl = gm20b_ltc_cbc_ctrl; | 366 | gops->ltc.cbc_ctrl = gm20b_ltc_cbc_ctrl; |
415 | gops->ltc.elpg_flush = gm20b_ltc_g_elpg_flush_locked; | ||
416 | gops->ltc.isr = gm20b_ltc_isr; | 367 | gops->ltc.isr = gm20b_ltc_isr; |
417 | gops->ltc.cbc_fix_config = gm20b_ltc_cbc_fix_config; | 368 | gops->ltc.cbc_fix_config = gm20b_ltc_cbc_fix_config; |
418 | gops->ltc.flush = gm20b_flush_ltc; | 369 | gops->ltc.flush = gm20b_flush_ltc; |
diff --git a/drivers/gpu/nvgpu/gm20b/ltc_gm20b.h b/drivers/gpu/nvgpu/gm20b/ltc_gm20b.h index 288e193a..fcd263de 100644 --- a/drivers/gpu/nvgpu/gm20b/ltc_gm20b.h +++ b/drivers/gpu/nvgpu/gm20b/ltc_gm20b.h | |||
@@ -21,7 +21,6 @@ void gm20b_init_ltc(struct gpu_ops *gops); | |||
21 | void gm20b_ltc_init_fs_state(struct gk20a *g); | 21 | void gm20b_ltc_init_fs_state(struct gk20a *g); |
22 | int gm20b_ltc_cbc_ctrl(struct gk20a *g, enum gk20a_cbc_op op, | 22 | int gm20b_ltc_cbc_ctrl(struct gk20a *g, enum gk20a_cbc_op op, |
23 | u32 min, u32 max); | 23 | u32 min, u32 max); |
24 | void gm20b_ltc_g_elpg_flush_locked(struct gk20a *g); | ||
25 | void gm20b_ltc_isr(struct gk20a *g); | 24 | void gm20b_ltc_isr(struct gk20a *g); |
26 | u32 gm20b_ltc_cbc_fix_config(struct gk20a *g, int base); | 25 | u32 gm20b_ltc_cbc_fix_config(struct gk20a *g, int base); |
27 | void gm20b_flush_ltc(struct gk20a *g); | 26 | void gm20b_flush_ltc(struct gk20a *g); |