From 866fee02478eb9db7978a81618b601eb717d4799 Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Fri, 17 Mar 2017 09:55:43 -0700 Subject: gpu: nvgpu: Remove ELPG_FLUSH ELPG_FLUSH is not accessible in later GPUs, so we stopped using it and instead do explicit CBC and L2 flushes. Delete the unused function op and backing code. Change-Id: Ic3eb97f2d32ea8fdbe5ec57bd9254268caaf9935 Signed-off-by: Terje Bergstrom Reviewed-on: http://git-master/r/1323236 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gm20b/ltc_gm20b.c | 49 ------------------------------------- drivers/gpu/nvgpu/gm20b/ltc_gm20b.h | 1 - 2 files changed, 50 deletions(-) (limited to 'drivers/gpu/nvgpu/gm20b') 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) } } -void gm20b_ltc_g_elpg_flush_locked(struct gk20a *g) -{ - u32 data; - bool done[g->ltc_count]; - s32 retry = 100; - unsigned int i; - unsigned int num_done = 0; - u32 ltc_d = ltc_ltc1_ltss_g_elpg_r() - ltc_ltc0_ltss_g_elpg_r(); - - gk20a_dbg_fn(""); - - trace_gk20a_mm_g_elpg_flush_locked(dev_name(g->dev)); - - for (i = 0; i < g->ltc_count; i++) - done[i] = 0; - - gk20a_writel(g, ltc_ltcs_ltss_g_elpg_r(), - ltc_ltcs_ltss_g_elpg_flush_pending_f()); - do { - for (i = 0; i < g->ltc_count; i++) { - if (done[i]) - continue; - - data = gk20a_readl(g, - ltc_ltc0_ltss_g_elpg_r() + ltc_d * i); - - if (ltc_ltc0_ltss_g_elpg_flush_v(data)) { - gk20a_dbg_info("g_elpg_flush 0x%x", data); - } else { - done[i] = 1; - num_done++; - } - } - - if (num_done < g->ltc_count) { - retry--; - udelay(5); - } else - break; - } while (retry >= 0 || !tegra_platform_is_silicon()); - - if (retry < 0 && tegra_platform_is_silicon()) - gk20a_warn(dev_from_gk20a(g), - "g_elpg_flush too many retries"); - - trace_gk20a_mm_g_elpg_flush_locked_done(dev_name(g->dev)); -} - u32 gm20b_ltc_cbc_fix_config(struct gk20a *g, int base) { 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) gops->ltc.init_fs_state = gm20b_ltc_init_fs_state; gops->ltc.init_comptags = gm20b_ltc_init_comptags; gops->ltc.cbc_ctrl = gm20b_ltc_cbc_ctrl; - gops->ltc.elpg_flush = gm20b_ltc_g_elpg_flush_locked; gops->ltc.isr = gm20b_ltc_isr; gops->ltc.cbc_fix_config = gm20b_ltc_cbc_fix_config; 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); void gm20b_ltc_init_fs_state(struct gk20a *g); int gm20b_ltc_cbc_ctrl(struct gk20a *g, enum gk20a_cbc_op op, u32 min, u32 max); -void gm20b_ltc_g_elpg_flush_locked(struct gk20a *g); void gm20b_ltc_isr(struct gk20a *g); u32 gm20b_ltc_cbc_fix_config(struct gk20a *g, int base); void gm20b_flush_ltc(struct gk20a *g); -- cgit v1.2.2