diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gp106')
-rw-r--r-- | drivers/gpu/nvgpu/gp106/acr_gp106.c | 3 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp106/hal_gp106.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gp106/acr_gp106.c b/drivers/gpu/nvgpu/gp106/acr_gp106.c index dce297bd..929036a3 100644 --- a/drivers/gpu/nvgpu/gp106/acr_gp106.c +++ b/drivers/gpu/nvgpu/gp106/acr_gp106.c | |||
@@ -21,6 +21,7 @@ | |||
21 | #include <nvgpu/acr/nvgpu_acr.h> | 21 | #include <nvgpu/acr/nvgpu_acr.h> |
22 | #include <nvgpu/firmware.h> | 22 | #include <nvgpu/firmware.h> |
23 | #include <nvgpu/pmu.h> | 23 | #include <nvgpu/pmu.h> |
24 | #include <nvgpu/enabled.h> | ||
24 | 25 | ||
25 | #include "gk20a/gk20a.h" | 26 | #include "gk20a/gk20a.h" |
26 | #include "gk20a/pmu_gk20a.h" | 27 | #include "gk20a/pmu_gk20a.h" |
@@ -286,7 +287,7 @@ int gpccs_ucode_details(struct gk20a *g, struct flcn_ucode_img_v1 *p_img) | |||
286 | struct nvgpu_firmware *gpccs_sig = NULL; | 287 | struct nvgpu_firmware *gpccs_sig = NULL; |
287 | int err; | 288 | int err; |
288 | 289 | ||
289 | if (g->ops.securegpccs == false) | 290 | if (!nvgpu_is_enabled(g, NVGPU_SEC_SECUREGPCCS)) |
290 | return -ENOENT; | 291 | return -ENOENT; |
291 | 292 | ||
292 | switch (ver) { | 293 | switch (ver) { |
diff --git a/drivers/gpu/nvgpu/gp106/hal_gp106.c b/drivers/gpu/nvgpu/gp106/hal_gp106.c index 2a661734..80117ede 100644 --- a/drivers/gpu/nvgpu/gp106/hal_gp106.c +++ b/drivers/gpu/nvgpu/gp106/hal_gp106.c | |||
@@ -417,7 +417,7 @@ int gp106_init_hal(struct gk20a *g) | |||
417 | gops->bios_init = gp106_ops.bios_init; | 417 | gops->bios_init = gp106_ops.bios_init; |
418 | 418 | ||
419 | gops->privsecurity = 1; | 419 | gops->privsecurity = 1; |
420 | gops->securegpccs = 1; | 420 | __nvgpu_set_enabled(g, NVGPU_SEC_SECUREGPCCS, true); |
421 | __nvgpu_set_enabled(g, NVGPU_PMU_PSTATE, true); | 421 | __nvgpu_set_enabled(g, NVGPU_PMU_PSTATE, true); |
422 | 422 | ||
423 | g->bootstrap_owner = LSF_FALCON_ID_SEC2; | 423 | g->bootstrap_owner = LSF_FALCON_ID_SEC2; |