summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gk20a
diff options
context:
space:
mode:
authorThomas Fleury <tfleury@nvidia.com>2018-02-20 23:39:22 -0500
committermobile promotions <svcmobile_promotions@nvidia.com>2018-05-07 19:03:45 -0400
commita5f3fe9506dcf87910eba24c80a4b30c03dcced1 (patch)
tree322374f40e46286ac0b98abe6e3dbce293943943 /drivers/gpu/nvgpu/gk20a
parent15ec5722be8f483f6d9c1cd0bfd61a7e2bcbfca2 (diff)
gpu: nvgpu: gv100: enable syncpt shim for nvlink
Get host1x node reference from c1_rp device tree node, and enable syncpoints shim in case of nvlink. JIRA EVLR-2441 JIRA EVLR-2585 Change-Id: Idbf1edf656557f2ed2d3bd27393c2f4d5d1ad75a Signed-off-by: Thomas Fleury <tfleury@nvidia.com> Reviewed-on: https://git-master.nvidia.com/r/1663360 Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a')
-rw-r--r--drivers/gpu/nvgpu/gk20a/gk20a.c14
1 files changed, 5 insertions, 9 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c
index 8c81b5b6..e8008937 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.c
@@ -182,15 +182,11 @@ int gk20a_finalize_poweron(struct gk20a *g)
182 } 182 }
183 183
184 if (nvgpu_is_enabled(g, NVGPU_SUPPORT_NVLINK)) { 184 if (nvgpu_is_enabled(g, NVGPU_SUPPORT_NVLINK)) {
185 if (g->ops.nvlink.init) { 185 err = g->ops.nvlink.init(g);
186 err = g->ops.nvlink.init(g); 186 if (err) {
187 if (err) { 187 nvgpu_err(g, "failed to init nvlink");
188 nvgpu_err(g, "failed to init nvlink"); 188 goto done;
189 __nvgpu_set_enabled(g, NVGPU_SUPPORT_NVLINK, 189 }
190 false);
191 }
192 } else
193 __nvgpu_set_enabled(g, NVGPU_SUPPORT_NVLINK, false);
194 } 190 }
195 191
196 if (g->ops.fb.mem_unlock) { 192 if (g->ops.fb.mem_unlock) {