diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2016-03-11 13:09:28 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2016-03-11 13:09:28 +1000 |
| commit | 8da6b08c44c085ceb3be9dce11c4a684f6a306a6 (patch) | |
| tree | e27df80a53f34386da0d5f46764b72f99860264c | |
| parent | a68064222c710094b8207d92d2c3d71d5f0332ea (diff) | |
| download | nouveau-8da6b08c44c085ceb3be9dce11c4a684f6a306a6.tar.gz | |
fifo/gk104: add sec plumbing
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| -rw-r--r-- | drm/nouveau/include/nvif/cla06f.h | 1 | ||||
| -rw-r--r-- | drm/nouveau/nvkm/engine/fifo/gpfifogk104.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/drm/nouveau/include/nvif/cla06f.h b/drm/nouveau/include/nvif/cla06f.h index 663ecde66..b5dec1377 100644 --- a/drm/nouveau/include/nvif/cla06f.h +++ b/drm/nouveau/include/nvif/cla06f.h @@ -7,6 +7,7 @@ struct kepler_channel_gpfifo_a_v0 { __u16 chid; #define NVA06F_V0_ENGINE_SW 0x00000001 #define NVA06F_V0_ENGINE_GR 0x00000002 +#define NVA06F_V0_ENGINE_SEC 0x00000004 #define NVA06F_V0_ENGINE_MSVLD 0x00000010 #define NVA06F_V0_ENGINE_MSPDEC 0x00000020 #define NVA06F_V0_ENGINE_MSPPP 0x00000040 diff --git a/drm/nouveau/nvkm/engine/fifo/gpfifogk104.c b/drm/nouveau/nvkm/engine/fifo/gpfifogk104.c index 434335ae2..917ef0ff4 100644 --- a/drm/nouveau/nvkm/engine/fifo/gpfifogk104.c +++ b/drm/nouveau/nvkm/engine/fifo/gpfifogk104.c @@ -63,6 +63,7 @@ gk104_fifo_gpfifo_engine_addr(struct nvkm_engine *engine) case NVKM_ENGINE_CE1 : case NVKM_ENGINE_CE2 : return 0x0000; case NVKM_ENGINE_GR : return 0x0210; + case NVKM_ENGINE_SEC : return 0x0220; case NVKM_ENGINE_MSPDEC: return 0x0250; case NVKM_ENGINE_MSPPP : return 0x0260; case NVKM_ENGINE_MSVLD : return 0x0270; @@ -340,6 +341,7 @@ gk104_fifo_gpfifo[] = { { NVA06F_V0_ENGINE_SW | NVA06F_V0_ENGINE_GR, BIT_ULL(NVKM_ENGINE_SW) | BIT_ULL(NVKM_ENGINE_GR) }, + { NVA06F_V0_ENGINE_SEC , BIT_ULL(NVKM_ENGINE_SEC ) }, { NVA06F_V0_ENGINE_MSVLD , BIT_ULL(NVKM_ENGINE_MSVLD ) }, { NVA06F_V0_ENGINE_MSPDEC, BIT_ULL(NVKM_ENGINE_MSPDEC) }, { NVA06F_V0_ENGINE_MSPPP , BIT_ULL(NVKM_ENGINE_MSPPP ) }, |