From a5f3fe9506dcf87910eba24c80a4b30c03dcced1 Mon Sep 17 00:00:00 2001 From: Thomas Fleury Date: Tue, 20 Feb 2018 20:39:22 -0800 Subject: 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 Reviewed-on: https://git-master.nvidia.com/r/1663360 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gk20a/gk20a.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'drivers/gpu/nvgpu/gk20a') 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) } if (nvgpu_is_enabled(g, NVGPU_SUPPORT_NVLINK)) { - if (g->ops.nvlink.init) { - err = g->ops.nvlink.init(g); - if (err) { - nvgpu_err(g, "failed to init nvlink"); - __nvgpu_set_enabled(g, NVGPU_SUPPORT_NVLINK, - false); - } - } else - __nvgpu_set_enabled(g, NVGPU_SUPPORT_NVLINK, false); + err = g->ops.nvlink.init(g); + if (err) { + nvgpu_err(g, "failed to init nvlink"); + goto done; + } } if (g->ops.fb.mem_unlock) { -- cgit v1.2.2