From a84f601fbaf6b40e14a321eda1e83d93e55cebba Mon Sep 17 00:00:00 2001 From: David Nieto Date: Fri, 17 Mar 2017 09:47:17 -0700 Subject: gpu: nvgpu: remove duplicated busy in debugger On the past, we had separate calls for platform and channel busy, but those got removed. The result is that in the debugger code we have essentially a double busy call int the powergating enable/disable. This change removes it bug 200277762 JIRA: EVLR-1023 Change-Id: Iba70b81700f27b847e1d0222fb69ed1a7a883342 Signed-off-by: David Nieto Reviewed-on: http://git-master/r/1323220 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: svccoveritychecker Reviewed-by: Terje Bergstrom GVS: Gerrit_Virtual_Submit --- drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'drivers') diff --git a/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c b/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c index 12d81343..fb70c88b 100644 --- a/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c @@ -1287,10 +1287,6 @@ static int dbg_set_powergate(struct dbg_session_gk20a *dbg_s, u32 powermode) if (err) return err; - err = gk20a_busy(dbg_s->dev); - if (err) - return -EPERM; - /*do elpg disable before clock gating */ gk20a_pmu_pg_global_enable(g, false); @@ -1342,7 +1338,6 @@ static int dbg_set_powergate(struct dbg_session_gk20a *dbg_s, u32 powermode) gk20a_pmu_pg_global_enable(g, true); gk20a_dbg(gpu_dbg_gpu_dbg | gpu_dbg_fn, "module idle"); - gk20a_idle(dbg_s->dev); gk20a_idle(g->dev); } @@ -1438,6 +1433,7 @@ static int nvgpu_dbg_gpu_ioctl_hwpm_ctxsw_mode(struct dbg_session_gk20a *dbg_s, "session doesn't have a valid reservation"); } + err = gk20a_busy(g->dev); if (err) { gk20a_err(dev_from_gk20a(g), "failed to poweron"); -- cgit v1.2.2