From 3bd0430aa83b52de62d5607bb363bea9d6d6e267 Mon Sep 17 00:00:00 2001 From: Seshendra Gadagottu Date: Tue, 28 Apr 2020 20:23:05 -0700 Subject: [PATCH] gpu: nvgpu: for nvgpu-next do not reset grce engines twice NVGPU_ENGINE_GRCE engines are getting reset twice, once in nvgpu_init_prepare_hw() and other time in nvgpu_ce_init_support(). To avoid this, remove NVGPU_ENGINE_GRCE engines reset from nvgpu_init_prepare_hw. JIRA NVGPU-5288 Signed-off-by: Seshendra Gadagottu Change-Id: Ic03dbff0a74e973ba423abfa004e49bdd8e451f7 Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2336450 Reviewed-by: automaticguardword Reviewed-by: svc-mobile-coverity Reviewed-by: svc-mobile-misra Reviewed-by: svc-mobile-cert Reviewed-by: Alex Waterman Reviewed-by: mobile promotions Tested-by: mobile promotions GVS: Gerrit_Virtual_Submit --- drivers/gpu/nvgpu/common/gr/gr.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/drivers/gpu/nvgpu/common/gr/gr.c b/drivers/gpu/nvgpu/common/gr/gr.c index b7a0d0f13..71a4ae88c 100644 --- a/drivers/gpu/nvgpu/common/gr/gr.c +++ b/drivers/gpu/nvgpu/common/gr/gr.c @@ -660,11 +660,6 @@ static int gr_init_prepare_hw(struct gk20a *g) nvgpu_err(g, "NVGPU_ENGINE_GR reset failed"); return err; } - err = nvgpu_next_mc_reset_engine(g, NVGPU_ENGINE_GRCE); - if (err != 0) { - nvgpu_err(g, "NVGPU_ENGINE_GRCE reset failed"); - return err; - } } else { #endif /* reset gr engine */