diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/gr_gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gr_gk20a.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c index b2225dae..48becc81 100644 --- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c | |||
@@ -4935,9 +4935,6 @@ static void gr_gk20a_load_gating_prod(struct gk20a *g) | |||
4935 | if (g->ops.clock_gating.blcg_bus_load_gating_prod) | 4935 | if (g->ops.clock_gating.blcg_bus_load_gating_prod) |
4936 | g->ops.clock_gating.blcg_bus_load_gating_prod(g, | 4936 | g->ops.clock_gating.blcg_bus_load_gating_prod(g, |
4937 | g->blcg_enabled); | 4937 | g->blcg_enabled); |
4938 | if (g->ops.clock_gating.blcg_ce_load_gating_prod) | ||
4939 | g->ops.clock_gating.blcg_ce_load_gating_prod(g, | ||
4940 | g->blcg_enabled); | ||
4941 | if (g->ops.clock_gating.blcg_gr_load_gating_prod) | 4938 | if (g->ops.clock_gating.blcg_gr_load_gating_prod) |
4942 | g->ops.clock_gating.blcg_gr_load_gating_prod(g, | 4939 | g->ops.clock_gating.blcg_gr_load_gating_prod(g, |
4943 | g->blcg_enabled); | 4940 | g->blcg_enabled); |
@@ -4957,9 +4954,6 @@ static int gk20a_init_gr_prepare(struct gk20a *g) | |||
4957 | { | 4954 | { |
4958 | u32 gpfifo_ctrl, pmc_en; | 4955 | u32 gpfifo_ctrl, pmc_en; |
4959 | u32 err = 0; | 4956 | u32 err = 0; |
4960 | u32 ce_reset_mask; | ||
4961 | |||
4962 | ce_reset_mask = gk20a_fifo_get_all_ce_engine_reset_mask(g); | ||
4963 | 4957 | ||
4964 | /* disable fifo access */ | 4958 | /* disable fifo access */ |
4965 | pmc_en = gk20a_readl(g, mc_enable_r()); | 4959 | pmc_en = gk20a_readl(g, mc_enable_r()); |
@@ -4972,8 +4966,7 @@ static int gk20a_init_gr_prepare(struct gk20a *g) | |||
4972 | /* reset gr engine */ | 4966 | /* reset gr engine */ |
4973 | g->ops.mc.reset(g, mc_enable_pgraph_enabled_f() | | 4967 | g->ops.mc.reset(g, mc_enable_pgraph_enabled_f() | |
4974 | mc_enable_blg_enabled_f() | | 4968 | mc_enable_blg_enabled_f() | |
4975 | mc_enable_perfmon_enabled_f() | | 4969 | mc_enable_perfmon_enabled_f()); |
4976 | ce_reset_mask); | ||
4977 | 4970 | ||
4978 | gr_gk20a_load_gating_prod(g); | 4971 | gr_gk20a_load_gating_prod(g); |
4979 | 4972 | ||