diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2016-05-13 14:39:02 -0400 |
---|---|---|
committer | Alexander Van Brunt <avanbrunt@nvidia.com> | 2016-05-13 20:30:09 -0400 |
commit | 3a1321ddcd33accd6a8a6efee2921ebf088b0f50 (patch) | |
tree | 6cb82c2897750e00cccebf7b11401300855a8b12 /drivers/gpu/nvgpu | |
parent | 773b3f2034fbff98af7770e735347f536cbbb21a (diff) |
Revert "gpu: nvgpu: Enable FB before initializing L2"
This reverts commit df05d2a7c214bc8cdb887f1609853d0f424ef6f1. It causes
intermittent failures on laguna_t124.
Bug 1766083
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Change-Id: Idabcf96d2eaddc989b029c429cec213bcabbf28c
Reviewed-on: http://git-master/r/1147683
Reviewed-by: Alexander Van Brunt <avanbrunt@nvidia.com>
Tested-by: Alexander Van Brunt <avanbrunt@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/mm_gk20a.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c index c07e7e4b..3ae30e88 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gk20a.c | |||
@@ -838,8 +838,6 @@ int gk20a_pm_finalize_poweron(struct device *dev) | |||
838 | goto done; | 838 | goto done; |
839 | } | 839 | } |
840 | 840 | ||
841 | g->ops.fb.reset(g); | ||
842 | |||
843 | if (g->ops.ltc.init_fs_state) | 841 | if (g->ops.ltc.init_fs_state) |
844 | g->ops.ltc.init_fs_state(g); | 842 | g->ops.ltc.init_fs_state(g); |
845 | 843 | ||
diff --git a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c index 13382416..eb4f01e0 100644 --- a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c | |||
@@ -486,6 +486,8 @@ static int gk20a_alloc_comptags(struct gk20a *g, | |||
486 | static int gk20a_init_mm_reset_enable_hw(struct gk20a *g) | 486 | static int gk20a_init_mm_reset_enable_hw(struct gk20a *g) |
487 | { | 487 | { |
488 | gk20a_dbg_fn(""); | 488 | gk20a_dbg_fn(""); |
489 | if (g->ops.fb.reset) | ||
490 | g->ops.fb.reset(g); | ||
489 | 491 | ||
490 | if (g->ops.clock_gating.slcg_fb_load_gating_prod) | 492 | if (g->ops.clock_gating.slcg_fb_load_gating_prod) |
491 | g->ops.clock_gating.slcg_fb_load_gating_prod(g, | 493 | g->ops.clock_gating.slcg_fb_load_gating_prod(g, |