From 3a1321ddcd33accd6a8a6efee2921ebf088b0f50 Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Fri, 13 May 2016 11:39:02 -0700 Subject: 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 Change-Id: Idabcf96d2eaddc989b029c429cec213bcabbf28c Reviewed-on: http://git-master/r/1147683 Reviewed-by: Alexander Van Brunt Tested-by: Alexander Van Brunt --- drivers/gpu/nvgpu/gk20a/gk20a.c | 2 -- drivers/gpu/nvgpu/gk20a/mm_gk20a.c | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers') 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) goto done; } - g->ops.fb.reset(g); - if (g->ops.ltc.init_fs_state) g->ops.ltc.init_fs_state(g); 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, static int gk20a_init_mm_reset_enable_hw(struct gk20a *g) { gk20a_dbg_fn(""); + if (g->ops.fb.reset) + g->ops.fb.reset(g); if (g->ops.clock_gating.slcg_fb_load_gating_prod) g->ops.clock_gating.slcg_fb_load_gating_prod(g, -- cgit v1.2.2