diff options
author | Mahantesh Kumbar <mkumbar@nvidia.com> | 2016-02-26 04:57:44 -0500 |
---|---|---|
committer | Terje Bergstrom <tbergstrom@nvidia.com> | 2016-02-26 15:28:11 -0500 |
commit | 6d585840ad5887407512dd292698100df50e5eed (patch) | |
tree | 1eb6b007ee498b9567ae01ce7b89b2cac4aab902 /drivers/gpu/nvgpu/gk20a/gr_gk20a.h | |
parent | de66bf2869b0ad1e29753d088a6c967270624f57 (diff) |
gpu: nvgpu: Enable ELPG when disabled due to reset
Enable ELPG back whenever ELPG disable is done due to reset or recovery.
Otherwise elpg_refcnt mismatch doesn't engage ELPG correctly
Bug 200156347
Bug 1716764
Change-Id: I9284bb52b32fe911bb8eb260f138b616f4a564be
Signed-off-by: Mahantesh Kumbar <mkumbar@nvidia.com>
Reviewed-on: http://git-master/r/1020617
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-by: Seshendra Gadagottu <sgadagottu@nvidia.com>
Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/gr_gk20a.h')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gr_gk20a.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.h b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h index 9c37fd02..326b4f96 100644 --- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h | |||
@@ -458,11 +458,15 @@ void gk20a_gr_clear_sm_hww(struct gk20a *g, | |||
458 | #define gr_gk20a_elpg_protected_call(g, func) \ | 458 | #define gr_gk20a_elpg_protected_call(g, func) \ |
459 | ({ \ | 459 | ({ \ |
460 | int err = 0; \ | 460 | int err = 0; \ |
461 | if (support_gk20a_pmu(g->dev)) \ | 461 | if (support_gk20a_pmu(g->dev) && g->elpg_enabled) {\ |
462 | err = gk20a_pmu_disable_elpg(g); \ | 462 | err = gk20a_pmu_disable_elpg(g); \ |
463 | if (err) return err; \ | 463 | if (err) { \ |
464 | gk20a_pmu_enable_elpg(g); \ | ||
465 | return err; \ | ||
466 | } \ | ||
467 | } \ | ||
464 | err = func; \ | 468 | err = func; \ |
465 | if (support_gk20a_pmu(g->dev)) \ | 469 | if (support_gk20a_pmu(g->dev) && g->elpg_enabled) \ |
466 | gk20a_pmu_enable_elpg(g); \ | 470 | gk20a_pmu_enable_elpg(g); \ |
467 | err; \ | 471 | err; \ |
468 | }) | 472 | }) |