summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gk20a/gr_gk20a.h
diff options
context:
space:
mode:
authorSeshendra Gadagottu <sgadagottu@nvidia.com>2016-01-06 13:42:04 -0500
committerHoang Pham <hopham@nvidia.com>2016-01-07 13:58:03 -0500
commitaeee97b059c0c2d1960d5dae7c86b7858cd00cce (patch)
tree783a003a16154f4556a228983834ed0d08865ce6 /drivers/gpu/nvgpu/gk20a/gr_gk20a.h
parent9812bd5eea1c5d2c97149d64c5ccf81eae75fda1 (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/gr_gk20a.h')
-rw-r--r--drivers/gpu/nvgpu/gk20a/gr_gk20a.h5
1 files changed, 1 insertions, 4 deletions
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,
439 int err = 0; \ 439 int err = 0; \
440 if (support_gk20a_pmu(g->dev)) \ 440 if (support_gk20a_pmu(g->dev)) \
441 err = gk20a_pmu_disable_elpg(g); \ 441 err = gk20a_pmu_disable_elpg(g); \
442 if (err) { \ 442 if (err) return err; \
443 gk20a_pmu_enable_elpg(g); \
444 return err; \
445 } \
446 err = func; \ 443 err = func; \
447 if (support_gk20a_pmu(g->dev)) \ 444 if (support_gk20a_pmu(g->dev)) \
448 gk20a_pmu_enable_elpg(g); \ 445 gk20a_pmu_enable_elpg(g); \