diff options
| author | Alexandre Courbot <acourbot@nvidia.com> | 2015-12-11 17:57:17 +0900 |
|---|---|---|
| committer | Alexandre Courbot <acourbot@nvidia.com> | 2015-12-11 17:58:52 +0900 |
| commit | 5040227468e92a832093ae8256e351553d74a36a (patch) | |
| tree | 5c4d0d8468e80c776f78dfde2829313e548bd7b5 | |
| parent | c0d6e89e7756968e0d7263744b8098f61e1f2ae1 (diff) | |
| download | nouveau-5040227468e92a832093ae8256e351553d74a36a.tar.gz | |
gm204: enable secure boot
| -rw-r--r-- | drm/nouveau/nvkm/engine/device/base.c | 4 | ||||
| -rw-r--r-- | drm/nouveau/nvkm/engine/gr/gm204.c | 8 |
2 files changed, 5 insertions, 7 deletions
diff --git a/drm/nouveau/nvkm/engine/device/base.c b/drm/nouveau/nvkm/engine/device/base.c index 4072ed418..6aa874e7c 100644 --- a/drm/nouveau/nvkm/engine/device/base.c +++ b/drm/nouveau/nvkm/engine/device/base.c @@ -1992,6 +1992,10 @@ nv124_chipset = { .fifo = gm204_fifo_new, .gr = gm204_gr_new, .sw = gf100_sw_new, + .secure_boot = { + .managed_falcons = BIT(LSF_FALCON_ID_FECS) | BIT(LSF_FALCON_ID_GPCCS), + .boot_falcon = LSF_FALCON_ID_PMU, + }, }; static const struct nvkm_device_chip diff --git a/drm/nouveau/nvkm/engine/gr/gm204.c b/drm/nouveau/nvkm/engine/gr/gm204.c index 90381dde4..69a3218bf 100644 --- a/drm/nouveau/nvkm/engine/gr/gm204.c +++ b/drm/nouveau/nvkm/engine/gr/gm204.c @@ -229,12 +229,6 @@ gm204_gr_data[] = { * PGRAPH engine/subdev functions ******************************************************************************/ -static int -gm204_gr_init_ctxctl(struct gf100_gr *gr) -{ - return 0; -} - int gm204_gr_init(struct gf100_gr *gr) { @@ -348,7 +342,7 @@ gm204_gr_init(struct gf100_gr *gr) gf100_gr_zbc_init(gr); - return gm204_gr_init_ctxctl(gr); + return gf100_gr_init_ctxctl(gr); } static const struct gf100_gr_func |