diff options
author | Seshendra Gadagottu <sgadagottu@nvidia.com> | 2016-01-06 13:42:04 -0500 |
---|---|---|
committer | Hoang Pham <hopham@nvidia.com> | 2016-01-07 13:58:03 -0500 |
commit | aeee97b059c0c2d1960d5dae7c86b7858cd00cce (patch) | |
tree | 783a003a16154f4556a228983834ed0d08865ce6 /drivers/gpu/nvgpu/gk20a/fifo_gk20a.c | |
parent | 9812bd5eea1c5d2c97149d64c5ccf81eae75fda1 (diff) |
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 <sgadagottu@nvidia.com>
Reviewed-on: http://git-master/r/929605
Tested-by: Hoang Pham <hopham@nvidia.com>
Reviewed-by: Hoang Pham <hopham@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/fifo_gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/fifo_gk20a.c | 4 |
1 files changed, 1 insertions, 3 deletions
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) | |||
780 | /* resetting engine using mc_enable_r() is not | 780 | /* resetting engine using mc_enable_r() is not |
781 | enough, we do full init sequence */ | 781 | enough, we do full init sequence */ |
782 | gk20a_gr_reset(g); | 782 | gk20a_gr_reset(g); |
783 | gk20a_pmu_enable_elpg(g); | ||
784 | } | 783 | } |
785 | if (engine_id == top_device_info_type_enum_copy0_v()) | 784 | if (engine_id == top_device_info_type_enum_copy0_v()) |
786 | gk20a_reset(g, mc_enable_ce2_m()); | 785 | gk20a_reset(g, mc_enable_ce2_m()); |
@@ -1087,7 +1086,7 @@ static bool gk20a_fifo_handle_mmu_fault( | |||
1087 | " deferring channel recovery to channel free"); | 1086 | " deferring channel recovery to channel free"); |
1088 | /* clear interrupt */ | 1087 | /* clear interrupt */ |
1089 | gk20a_writel(g, fifo_intr_mmu_fault_id_r(), fault_id); | 1088 | gk20a_writel(g, fifo_intr_mmu_fault_id_r(), fault_id); |
1090 | goto exit_enable; | 1089 | return verbose; |
1091 | } | 1090 | } |
1092 | 1091 | ||
1093 | /* clear interrupt */ | 1092 | /* clear interrupt */ |
@@ -1102,7 +1101,6 @@ static bool gk20a_fifo_handle_mmu_fault( | |||
1102 | gr_gpfifo_ctl_access_enabled_f() | | 1101 | gr_gpfifo_ctl_access_enabled_f() | |
1103 | gr_gpfifo_ctl_semaphore_access_enabled_f()); | 1102 | gr_gpfifo_ctl_semaphore_access_enabled_f()); |
1104 | 1103 | ||
1105 | exit_enable: | ||
1106 | /* It is safe to enable ELPG again. */ | 1104 | /* It is safe to enable ELPG again. */ |
1107 | if (support_gk20a_pmu(g->dev) && g->elpg_enabled) | 1105 | if (support_gk20a_pmu(g->dev) && g->elpg_enabled) |
1108 | gk20a_pmu_enable_elpg(g); | 1106 | gk20a_pmu_enable_elpg(g); |