drm/nouveau/fifo/gk104: add nvenc plumbing

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/include/nvif/cla06f.h b/drivers/gpu/drm/nouveau/include/nvif/cla06f.h
index 6febc8265b0cba459aaf9ce2f62161f07522a766..f5083ba4add1cb0d35957c4f0d88604537ab7fd9 100644 (file)
--- a/drivers/gpu/drm/nouveau/include/nvif/cla06f.h
+++ b/drivers/gpu/drm/nouveau/include/nvif/cla06f.h
@@ -11,6 +11,8 @@ struct kepler_channel_gpfifo_a_v0 {
 #define NVA06F_V0_ENGINE_MSPDEC                                      0x00000020
 #define NVA06F_V0_ENGINE_MSPPP                                       0x00000040
 #define NVA06F_V0_ENGINE_MSENC                                       0x00000080
+#define NVA06F_V0_ENGINE_NVENC0                                      0x00000400
+#define NVA06F_V0_ENGINE_NVENC1                                      0x00000800
 #define NVA06F_V0_ENGINE_CE0                                         0x00010000
 #define NVA06F_V0_ENGINE_CE1                                         0x00020000
 #define NVA06F_V0_ENGINE_CE2                                         0x00040000

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c
index c7b5707488c5cdd569797807ec01fc3ce4e90033..a8115b17e5b1b65fe65e3a981bfadb2e7190e6ea 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c
@@ -735,6 +735,8 @@ gk104_fifo_oneinit(struct nvkm_fifo *base)
                case 0x0000000b: engidx = NVKM_ENGINE_MSENC; break;
                case 0x0000000c: engidx = NVKM_ENGINE_VIC; break;
                case 0x0000000d: engidx = NVKM_ENGINE_SEC; break;
+               case 0x0000000e: engidx = NVKM_ENGINE_NVENC0; break;
+               case 0x0000000f: engidx = NVKM_ENGINE_NVENC1; break;
                        break;
                default:
                        break;

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gpfifogk104.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gpfifogk104.c
index 095957b6fde5344f05ff25d4287984cce220ff25..24a6494421f4969f75c13218fcb20b4a184b487d 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gpfifogk104.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gpfifogk104.c
@@ -67,6 +67,8 @@ gk104_fifo_gpfifo_engine_addr(struct nvkm_engine *engine)
        case NVKM_ENGINE_MSPPP : return 0x0260;
        case NVKM_ENGINE_MSVLD : return 0x0270;
        case NVKM_ENGINE_MSENC : return 0x0290;
+       case NVKM_ENGINE_NVENC0: return 0x02100290;
+       case NVKM_ENGINE_NVENC1: return 0x0210;
        default:
                WARN_ON(1);
                return 0;
@@ -77,9 +79,9 @@ static int
 gk104_fifo_gpfifo_engine_fini(struct nvkm_fifo_chan *base,
                              struct nvkm_engine *engine, bool suspend)
 {
-       const u32 offset = gk104_fifo_gpfifo_engine_addr(engine);
        struct gk104_fifo_chan *chan = gk104_fifo_chan(base);
        struct nvkm_gpuobj *inst = chan->base.inst;
+       u32 offset = gk104_fifo_gpfifo_engine_addr(engine);
        int ret;
 
        ret = gk104_fifo_gpfifo_kick(chan);
@@ -88,8 +90,12 @@ gk104_fifo_gpfifo_engine_fini(struct nvkm_fifo_chan *base,
 
        if (offset) {
                nvkm_kmap(inst);
-               nvkm_wo32(inst, offset + 0x00, 0x00000000);
-               nvkm_wo32(inst, offset + 0x04, 0x00000000);
+               nvkm_wo32(inst, (offset & 0xffff) + 0x00, 0x00000000);
+               nvkm_wo32(inst, (offset & 0xffff) + 0x04, 0x00000000);
+               if ((offset >>= 16)) {
+                       nvkm_wo32(inst, offset + 0x00, 0x00000000);
+                       nvkm_wo32(inst, offset + 0x04, 0x00000000);
+               }
                nvkm_done(inst);
        }
 
@@ -100,15 +106,21 @@ static int
 gk104_fifo_gpfifo_engine_init(struct nvkm_fifo_chan *base,
                              struct nvkm_engine *engine)
 {
-       const u32 offset = gk104_fifo_gpfifo_engine_addr(engine);
        struct gk104_fifo_chan *chan = gk104_fifo_chan(base);
        struct nvkm_gpuobj *inst = chan->base.inst;
+       u32 offset = gk104_fifo_gpfifo_engine_addr(engine);
 
        if (offset) {
-               u64 addr = chan->engn[engine->subdev.index].vma.offset;
+               u64   addr = chan->engn[engine->subdev.index].vma.offset;
+               u32 datalo = lower_32_bits(addr) | 0x00000004;
+               u32 datahi = upper_32_bits(addr);
                nvkm_kmap(inst);
-               nvkm_wo32(inst, offset + 0x00, lower_32_bits(addr) | 4);
-               nvkm_wo32(inst, offset + 0x04, upper_32_bits(addr));
+               nvkm_wo32(inst, (offset & 0xffff) + 0x00, datalo);
+               nvkm_wo32(inst, (offset & 0xffff) + 0x04, datahi);
+               if ((offset >>= 16)) {
+                       nvkm_wo32(inst, offset + 0x00, datalo);
+                       nvkm_wo32(inst, offset + 0x04, datahi);
+               }
                nvkm_done(inst);
        }
 
@@ -331,6 +343,8 @@ gk104_fifo_gpfifo[] = {
        { NVA06F_V0_ENGINE_MSPDEC, BIT_ULL(NVKM_ENGINE_MSPDEC) },
        { NVA06F_V0_ENGINE_MSPPP , BIT_ULL(NVKM_ENGINE_MSPPP ) },
        { NVA06F_V0_ENGINE_MSENC , BIT_ULL(NVKM_ENGINE_MSENC ) },
+       { NVA06F_V0_ENGINE_NVENC0, BIT_ULL(NVKM_ENGINE_NVENC0) },
+       { NVA06F_V0_ENGINE_NVENC1, BIT_ULL(NVKM_ENGINE_NVENC1) },
        { NVA06F_V0_ENGINE_CE0   , BIT_ULL(NVKM_ENGINE_CE0   ) },
        { NVA06F_V0_ENGINE_CE1   , BIT_ULL(NVKM_ENGINE_CE1   ) },
        { NVA06F_V0_ENGINE_CE2   , BIT_ULL(NVKM_ENGINE_CE2   ) },