From afc470e867b7feb9338ccb086ace8989604683e0 Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Tue, 4 Nov 2014 12:17:21 +0200 Subject: gpu: nvgpu: Do not call ELPG if disabled Do not call PMU ELPG calls if ELPG should be disabled. Also skips initialization of PMU ucode if PMU is disabled. Bug 1567274 Change-Id: Ia9cd3b553c358142ee05a1b0e0832f9412f7cf17 Signed-off-by: Terje Bergstrom Reviewed-on: http://git-master/r/593335 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Seshendra Gadagottu --- drivers/gpu/nvgpu/gk20a/fifo_gk20a.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'drivers/gpu/nvgpu/gk20a/fifo_gk20a.c') diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c index 4095b079..df6b84c5 100644 --- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c @@ -900,7 +900,8 @@ void fifo_gk20a_finish_mmu_fault_handling(struct gk20a *g, gr_gpfifo_ctl_semaphore_access_enabled_f()); /* It is safe to enable ELPG again. */ - gk20a_pmu_enable_elpg(g); + if (support_gk20a_pmu(g->dev) && g->elpg_enabled) + gk20a_pmu_enable_elpg(g); } static bool gk20a_fifo_set_ctx_mmu_error(struct gk20a *g, @@ -974,7 +975,8 @@ static bool gk20a_fifo_handle_mmu_fault(struct gk20a *g) g->fifo.deferred_reset_pending = false; /* Disable power management */ - gk20a_pmu_disable_elpg(g); + if (support_gk20a_pmu(g->dev) && g->elpg_enabled) + gk20a_pmu_disable_elpg(g); g->ops.clock_gating.slcg_gr_load_gating_prod(g, false); g->ops.clock_gating.slcg_perf_load_gating_prod(g, -- cgit v1.2.2