summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gk20a
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a')
-rw-r--r--drivers/gpu/nvgpu/gk20a/flcn_gk20a.c2
-rw-r--r--drivers/gpu/nvgpu/gk20a/gk20a.c5
2 files changed, 5 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/flcn_gk20a.c b/drivers/gpu/nvgpu/gk20a/flcn_gk20a.c
index 5fa4dd53..fdcaef9b 100644
--- a/drivers/gpu/nvgpu/gk20a/flcn_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/flcn_gk20a.c
@@ -740,8 +740,6 @@ int gk20a_falcon_hal_sw_init(struct nvgpu_falcon *flcn)
740 break; 740 break;
741 default: 741 default:
742 flcn->is_falcon_supported = false; 742 flcn->is_falcon_supported = false;
743 nvgpu_err(g, "Invalid flcn request");
744 err = -ENODEV;
745 break; 743 break;
746 } 744 }
747 745
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c
index 2dfe9e58..9958d24f 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.c
@@ -164,6 +164,11 @@ int gk20a_finalize_poweron(struct gk20a *g)
164 nvgpu_err(g, "failed to sw init FALCON_ID_NVDEC"); 164 nvgpu_err(g, "failed to sw init FALCON_ID_NVDEC");
165 goto done; 165 goto done;
166 } 166 }
167 err = nvgpu_flcn_sw_init(g, FALCON_ID_GSPLITE);
168 if (err != 0) {
169 nvgpu_err(g, "failed to sw init FALCON_ID_GSPLITE");
170 goto done;
171 }
167 172
168 if (g->ops.acr.acr_sw_init != NULL && 173 if (g->ops.acr.acr_sw_init != NULL &&
169 nvgpu_is_enabled(g, NVGPU_SEC_PRIVSECURITY)) { 174 nvgpu_is_enabled(g, NVGPU_SEC_PRIVSECURITY)) {