summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gk20a/gk20a.c
diff options
context:
space:
mode:
authorDavid Nieto <dmartineznie@nvidia.com>2016-10-07 19:25:40 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2016-12-09 23:24:06 -0500
commit71ecc8f660503eed4a094b1b1531e8e92a6de0bb (patch)
treeb3068e70928273a41248587b0c052a15495056b5 /drivers/gpu/nvgpu/gk20a/gk20a.c
parent8cfcf181f1e9b03324e4bb04450de154fdf9834d (diff)
nvgpu: gpu: arbiter for vf switch management
JIRA DNVGPU-143 (1) Added conversion routines in ctrl_gk20a.c to do conversions between Hz and MHZ (2) Use new api to prevent corruption of requests is multiple threads on same session commit simultaneously Change-Id: I87875e593d2cc90647d5c4f60a4e293ed3ea6b83 Signed-off-by: David Nieto <dmartineznie@nvidia.com> Reviewed-on: http://git-master/r/1239460 Reviewed-by: Thomas Fleury <tfleury@nvidia.com> GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com> Reviewed-on: http://git-master/r/1267152 Reviewed-by: Automatic_Commit_Validation_User
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/gk20a.c')
-rw-r--r--drivers/gpu/nvgpu/gk20a/gk20a.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c
index df57ec7c..68a358d8 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.c
@@ -972,12 +972,6 @@ int gk20a_pm_finalize_poweron(struct device *dev)
972 goto done; 972 goto done;
973 } 973 }
974 } 974 }
975
976 err = nvgpu_clk_arb_init_arbiter(g);
977 if (err) {
978 gk20a_err(dev, "failed to init clk arb");
979 goto done;
980 }
981#endif 975#endif
982 976
983 if (g->ops.pmu.is_pmu_supported(g)) { 977 if (g->ops.pmu.is_pmu_supported(g)) {
@@ -1010,6 +1004,12 @@ int gk20a_pm_finalize_poweron(struct device *dev)
1010 goto done; 1004 goto done;
1011 } 1005 }
1012 } 1006 }
1007
1008 err = nvgpu_clk_arb_init_arbiter(g);
1009 if (err) {
1010 gk20a_err(dev, "failed to init clk arb");
1011 goto done;
1012 }
1013#endif 1013#endif
1014 1014
1015 err = gk20a_init_therm_support(g); 1015 err = gk20a_init_therm_support(g);