From aeee97b059c0c2d1960d5dae7c86b7858cd00cce Mon Sep 17 00:00:00 2001 From: Seshendra Gadagottu Date: Wed, 6 Jan 2016 10:42:04 -0800 Subject: Revert "gpu: nvgpu: Enable ELPG when disabled due to reset" This reverts commit f6ab5bd17d16f3605b78c3c2ee80513d5823c594. Fix for graphics_submit regresssion. Bug 200164812 Change-Id: I5e37b8263758ee389cdba3ec6e3758afbdd9c910 Signed-off-by: Seshendra Gadagottu Reviewed-on: http://git-master/r/929605 Tested-by: Hoang Pham Reviewed-by: Hoang Pham --- drivers/gpu/nvgpu/gk20a/fifo_gk20a.c | 4 +--- drivers/gpu/nvgpu/gk20a/gr_gk20a.h | 5 +---- 2 files changed, 2 insertions(+), 7 deletions(-) (limited to 'drivers') diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c index d8a73a75..1727cf1d 100644 --- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c @@ -780,7 +780,6 @@ void gk20a_fifo_reset_engine(struct gk20a *g, u32 engine_id) /* resetting engine using mc_enable_r() is not enough, we do full init sequence */ gk20a_gr_reset(g); - gk20a_pmu_enable_elpg(g); } if (engine_id == top_device_info_type_enum_copy0_v()) gk20a_reset(g, mc_enable_ce2_m()); @@ -1087,7 +1086,7 @@ static bool gk20a_fifo_handle_mmu_fault( " deferring channel recovery to channel free"); /* clear interrupt */ gk20a_writel(g, fifo_intr_mmu_fault_id_r(), fault_id); - goto exit_enable; + return verbose; } /* clear interrupt */ @@ -1102,7 +1101,6 @@ static bool gk20a_fifo_handle_mmu_fault( gr_gpfifo_ctl_access_enabled_f() | gr_gpfifo_ctl_semaphore_access_enabled_f()); -exit_enable: /* It is safe to enable ELPG again. */ if (support_gk20a_pmu(g->dev) && g->elpg_enabled) gk20a_pmu_enable_elpg(g); diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.h b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h index e2532593..51b87ac8 100644 --- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h @@ -439,10 +439,7 @@ void gk20a_gr_clear_sm_hww(struct gk20a *g, int err = 0; \ if (support_gk20a_pmu(g->dev)) \ err = gk20a_pmu_disable_elpg(g); \ - if (err) { \ - gk20a_pmu_enable_elpg(g); \ - return err; \ - } \ + if (err) return err; \ err = func; \ if (support_gk20a_pmu(g->dev)) \ gk20a_pmu_enable_elpg(g); \ -- cgit v1.2.2