diff options
author | Vijayakumar <vsubbu@nvidia.com> | 2015-09-28 07:13:13 -0400 |
---|---|---|
committer | Terje Bergstrom <tbergstrom@nvidia.com> | 2015-10-06 16:30:03 -0400 |
commit | c94c2035d67cbfd6262a7c08e00be0aac04d33ed (patch) | |
tree | b5d975fd1e56ebf0c2a93061ee8697d674ff8393 | |
parent | ed0737ab60248c24dbd0099c605e1157a95c52ff (diff) |
gpu: nvgpu: gk20a: dont disable pmu in pmu_destroy
bug 1688374
disabling pmu will break RAM suspend on chips implementing
split rails. pmu will be powered down along with rest of
the GPU anyway. pmu_destroy is not be used outside of
rail gating or gpu suspend
Change-Id: I9e89859b7c701f731276ae1d1063d9ccd88d4334
Signed-off-by: Vijayakumar <vsubbu@nvidia.com>
Reviewed-on: http://git-master/r/805940
(cherry picked from commit 8ded353878ff7df73e55b702041008ddc3cbf069)
Reviewed-on: http://git-master/r/808248
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/pmu_gk20a.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c index 4d459ef4..09230437 100644 --- a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c | |||
@@ -4179,7 +4179,6 @@ int gk20a_pmu_destroy(struct gk20a *g) | |||
4179 | g->pg_gating_cnt += gating_cnt; | 4179 | g->pg_gating_cnt += gating_cnt; |
4180 | 4180 | ||
4181 | mutex_lock(&pmu->isr_mutex); | 4181 | mutex_lock(&pmu->isr_mutex); |
4182 | pmu_enable(pmu, false); | ||
4183 | pmu->isr_enabled = false; | 4182 | pmu->isr_enabled = false; |
4184 | mutex_unlock(&pmu->isr_mutex); | 4183 | mutex_unlock(&pmu->isr_mutex); |
4185 | 4184 | ||