summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorDavid Nieto <dmartineznie@nvidia.com>2017-03-17 12:47:17 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2017-03-24 00:05:34 -0400
commita84f601fbaf6b40e14a321eda1e83d93e55cebba (patch)
tree47b13a9d287e5b02704da20f02b5bcb4160acb53 /drivers
parentab401c70682c98adae6f3c5c7225fdc8e1294fc7 (diff)
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 <dmartineznie@nvidia.com> Reviewed-on: http://git-master/r/1323220 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: svccoveritychecker <svccoveritychecker@nvidia.com> Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com> GVS: Gerrit_Virtual_Submit
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c6
1 files changed, 1 insertions, 5 deletions
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)
1287 if (err) 1287 if (err)
1288 return err; 1288 return err;
1289 1289
1290 err = gk20a_busy(dbg_s->dev);
1291 if (err)
1292 return -EPERM;
1293
1294 /*do elpg disable before clock gating */ 1290 /*do elpg disable before clock gating */
1295 gk20a_pmu_pg_global_enable(g, false); 1291 gk20a_pmu_pg_global_enable(g, false);
1296 1292
@@ -1342,7 +1338,6 @@ static int dbg_set_powergate(struct dbg_session_gk20a *dbg_s, u32 powermode)
1342 gk20a_pmu_pg_global_enable(g, true); 1338 gk20a_pmu_pg_global_enable(g, true);
1343 1339
1344 gk20a_dbg(gpu_dbg_gpu_dbg | gpu_dbg_fn, "module idle"); 1340 gk20a_dbg(gpu_dbg_gpu_dbg | gpu_dbg_fn, "module idle");
1345 gk20a_idle(dbg_s->dev);
1346 gk20a_idle(g->dev); 1341 gk20a_idle(g->dev);
1347 } 1342 }
1348 1343
@@ -1438,6 +1433,7 @@ static int nvgpu_dbg_gpu_ioctl_hwpm_ctxsw_mode(struct dbg_session_gk20a *dbg_s,
1438 "session doesn't have a valid reservation"); 1433 "session doesn't have a valid reservation");
1439 } 1434 }
1440 1435
1436
1441 err = gk20a_busy(g->dev); 1437 err = gk20a_busy(g->dev);
1442 if (err) { 1438 if (err) {
1443 gk20a_err(dev_from_gk20a(g), "failed to poweron"); 1439 gk20a_err(dev_from_gk20a(g), "failed to poweron");