drm/nouveau/nvenc: add a stub implementation for the GPUs where it should be supported

Mostly so we don't lose info hidden in falcon.

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

diff --git a/drivers/gpu/drm/nouveau/include/nvkm/core/device.h b/drivers/gpu/drm/nouveau/include/nvkm/core/device.h
index 3d42139c3f375ddbec6d0b9b25b21a7353a8629f..5598a36f11ecce430ffa7b33e2083bb46ccb2437 100644 (file)
--- a/drivers/gpu/drm/nouveau/include/nvkm/core/device.h
+++ b/drivers/gpu/drm/nouveau/include/nvkm/core/device.h
@@ -171,7 +171,7 @@ struct nvkm_device {
        struct nvkm_engine *mspdec;
        struct nvkm_engine *msppp;
        struct nvkm_engine *msvld;
-       struct nvkm_engine *nvenc[3];
+       struct nvkm_nvenc *nvenc[3];
        struct nvkm_nvdec *nvdec[3];
        struct nvkm_pm *pm;
        struct nvkm_engine *sec;
@@ -245,7 +245,7 @@ struct nvkm_device_chip {
        int (*mspdec  )(struct nvkm_device *, int idx, struct nvkm_engine **);
        int (*msppp   )(struct nvkm_device *, int idx, struct nvkm_engine **);
        int (*msvld   )(struct nvkm_device *, int idx, struct nvkm_engine **);
-       int (*nvenc[3])(struct nvkm_device *, int idx, struct nvkm_engine **);
+       int (*nvenc[3])(struct nvkm_device *, int idx, struct nvkm_nvenc **);
        int (*nvdec[3])(struct nvkm_device *, int idx, struct nvkm_nvdec **);
        int (*pm      )(struct nvkm_device *, int idx, struct nvkm_pm **);
        int (*sec     )(struct nvkm_device *, int idx, struct nvkm_engine **);

diff --git a/drivers/gpu/drm/nouveau/include/nvkm/engine/nvenc.h b/drivers/gpu/drm/nouveau/include/nvkm/engine/nvenc.h
index 21624046d0a1255665c8fea8ff58874dab1e74e0..33e6ba8adc8dc7ab0972349b004657ddf70f207d 100644 (file)
--- a/drivers/gpu/drm/nouveau/include/nvkm/engine/nvenc.h
+++ b/drivers/gpu/drm/nouveau/include/nvkm/engine/nvenc.h
@@ -1,5 +1,15 @@
 /* SPDX-License-Identifier: MIT */
 #ifndef __NVKM_NVENC_H__
 #define __NVKM_NVENC_H__
+#define nvkm_nvenc(p) container_of((p), struct nvkm_nvenc, engine)
 #include <core/engine.h>
+#include <core/falcon.h>
+
+struct nvkm_nvenc {
+       const struct nvkm_nvenc_func *func;
+       struct nvkm_engine engine;
+       struct nvkm_falcon falcon;
+};
+
+int gm107_nvenc_new(struct nvkm_device *, int, struct nvkm_nvenc **);
 #endif

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
index 53019ab7d04cd6bfb8256e31d7fccc416d1b1065..f98065b12c2431d83b5fc4d5686f4919d943f4d0 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
@@ -1988,6 +1988,7 @@ nv117_chipset = {
        .fifo = gm107_fifo_new,
        .gr = gm107_gr_new,
        .nvdec[0] = gm107_nvdec_new,
+       .nvenc[0] = gm107_nvenc_new,
        .sw = gf100_sw_new,
 };
 
@@ -2059,6 +2060,8 @@ nv120_chipset = {
        .fifo = gm200_fifo_new,
        .gr = gm200_gr_new,
        .nvdec[0] = gm107_nvdec_new,
+       .nvenc[0] = gm107_nvenc_new,
+       .nvenc[1] = gm107_nvenc_new,
        .sw = gf100_sw_new,
 };
 
@@ -2096,6 +2099,8 @@ nv124_chipset = {
        .fifo = gm200_fifo_new,
        .gr = gm200_gr_new,
        .nvdec[0] = gm107_nvdec_new,
+       .nvenc[0] = gm107_nvenc_new,
+       .nvenc[1] = gm107_nvenc_new,
        .sw = gf100_sw_new,
 };
 
@@ -2133,6 +2138,7 @@ nv126_chipset = {
        .fifo = gm200_fifo_new,
        .gr = gm200_gr_new,
        .nvdec[0] = gm107_nvdec_new,
+       .nvenc[0] = gm107_nvenc_new,
        .sw = gf100_sw_new,
 };
 
@@ -2197,6 +2203,9 @@ nv130_chipset = {
        .fifo = gp100_fifo_new,
        .gr = gp100_gr_new,
        .nvdec[0] = gm107_nvdec_new,
+       .nvenc[0] = gm107_nvenc_new,
+       .nvenc[1] = gm107_nvenc_new,
+       .nvenc[2] = gm107_nvenc_new,
        .sw = gf100_sw_new,
 };
 
@@ -2233,6 +2242,8 @@ nv132_chipset = {
        .fifo = gp100_fifo_new,
        .gr = gp102_gr_new,
        .nvdec[0] = gm107_nvdec_new,
+       .nvenc[0] = gm107_nvenc_new,
+       .nvenc[1] = gm107_nvenc_new,
        .sec2 = gp102_sec2_new,
        .sw = gf100_sw_new,
 };
@@ -2270,6 +2281,8 @@ nv134_chipset = {
        .fifo = gp100_fifo_new,
        .gr = gp104_gr_new,
        .nvdec[0] = gm107_nvdec_new,
+       .nvenc[0] = gm107_nvenc_new,
+       .nvenc[1] = gm107_nvenc_new,
        .sec2 = gp102_sec2_new,
        .sw = gf100_sw_new,
 };
@@ -2307,6 +2320,7 @@ nv136_chipset = {
        .fifo = gp100_fifo_new,
        .gr = gp104_gr_new,
        .nvdec[0] = gm107_nvdec_new,
+       .nvenc[0] = gm107_nvenc_new,
        .sec2 = gp102_sec2_new,
        .sw = gf100_sw_new,
 };
@@ -2344,6 +2358,8 @@ nv137_chipset = {
        .fifo = gp100_fifo_new,
        .gr = gp107_gr_new,
        .nvdec[0] = gm107_nvdec_new,
+       .nvenc[0] = gm107_nvenc_new,
+       .nvenc[1] = gm107_nvenc_new,
        .sec2 = gp102_sec2_new,
        .sw = gf100_sw_new,
 };
@@ -2449,6 +2465,9 @@ nv140_chipset = {
        .fifo = gv100_fifo_new,
        .gr = gv100_gr_new,
        .nvdec[0] = gm107_nvdec_new,
+       .nvenc[0] = gm107_nvenc_new,
+       .nvenc[1] = gm107_nvenc_new,
+       .nvenc[2] = gm107_nvenc_new,
        .sec2 = gp108_sec2_new,
 };
 
@@ -2484,6 +2503,7 @@ nv162_chipset = {
        .dma = gv100_dma_new,
        .fifo = tu102_fifo_new,
        .nvdec[0] = gm107_nvdec_new,
+       .nvenc[0] = gm107_nvenc_new,
        .sec2 = tu102_sec2_new,
 };
 
@@ -2520,6 +2540,7 @@ nv164_chipset = {
        .fifo = tu102_fifo_new,
        .nvdec[0] = gm107_nvdec_new,
        .nvdec[1] = gm107_nvdec_new,
+       .nvenc[0] = gm107_nvenc_new,
        .sec2 = tu102_sec2_new,
 };
 
@@ -2557,6 +2578,7 @@ nv166_chipset = {
        .nvdec[0] = gm107_nvdec_new,
        .nvdec[1] = gm107_nvdec_new,
        .nvdec[2] = gm107_nvdec_new,
+       .nvenc[0] = gm107_nvenc_new,
        .sec2 = tu102_sec2_new,
 };
 
@@ -2592,6 +2614,7 @@ nv167_chipset = {
        .dma = gv100_dma_new,
        .fifo = tu102_fifo_new,
        .nvdec[0] = gm107_nvdec_new,
+       .nvenc[0] = gm107_nvenc_new,
        .sec2 = tu102_sec2_new,
 };
 
@@ -2627,6 +2650,7 @@ nv168_chipset = {
        .dma = gv100_dma_new,
        .fifo = tu102_fifo_new,
        .nvdec[0] = gm107_nvdec_new,
+       .nvenc[0] = gm107_nvenc_new,
        .sec2 = tu102_sec2_new,
 };
 
@@ -2724,9 +2748,9 @@ nvkm_device_engine(struct nvkm_device *device, int index)
        _(MSPDEC , device->mspdec  ,  device->mspdec);
        _(MSPPP  , device->msppp   ,  device->msppp);
        _(MSVLD  , device->msvld   ,  device->msvld);
-       _(NVENC0 , device->nvenc[0],  device->nvenc[0]);
-       _(NVENC1 , device->nvenc[1],  device->nvenc[1]);
-       _(NVENC2 , device->nvenc[2],  device->nvenc[2]);
+       _(NVENC0 , device->nvenc[0], &device->nvenc[0]->engine);
+       _(NVENC1 , device->nvenc[1], &device->nvenc[1]->engine);
+       _(NVENC2 , device->nvenc[2], &device->nvenc[2]->engine);
        _(NVDEC0 , device->nvdec[0], &device->nvdec[0]->engine);
        _(NVDEC1 , device->nvdec[1], &device->nvdec[1]->engine);
        _(NVDEC2 , device->nvdec[2], &device->nvdec[2]->engine);

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/nvenc/Kbuild b/drivers/gpu/drm/nouveau/nvkm/engine/nvenc/Kbuild
index f316de8d45a88109dba3941222b640af21ac1f16..75bf4436bf3fe1fc039c43e0064dc82262ac2bc0 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/nvenc/Kbuild
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/nvenc/Kbuild
@@ -1,2 +1,3 @@
 # SPDX-License-Identifier: MIT
-#nvkm-y += nvkm/engine/nvenc/base.o
+nvkm-y += nvkm/engine/nvenc/base.o
+nvkm-y += nvkm/engine/nvenc/gm107.o

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/nvenc/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/nvenc/base.c
new file mode 100644 (file)
index 0000000..484100e
--- /dev/null
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/nvenc/base.c
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2019 Red Hat Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+#include "priv.h"
+
+#include "priv.h"
+#include <core/firmware.h>
+
+static void *
+nvkm_nvenc_dtor(struct nvkm_engine *engine)
+{
+       struct nvkm_nvenc *nvenc = nvkm_nvenc(engine);
+       nvkm_falcon_dtor(&nvenc->falcon);
+       return nvenc;
+}
+
+static const struct nvkm_engine_func
+nvkm_nvenc = {
+       .dtor = nvkm_nvenc_dtor,
+};
+
+int
+nvkm_nvenc_new_(const struct nvkm_nvenc_fwif *fwif, struct nvkm_device *device,
+               int index, struct nvkm_nvenc **pnvenc)
+{
+       struct nvkm_nvenc *nvenc;
+       int ret;
+
+       if (!(nvenc = *pnvenc = kzalloc(sizeof(*nvenc), GFP_KERNEL)))
+               return -ENOMEM;
+
+       ret = nvkm_engine_ctor(&nvkm_nvenc, device, index, true,
+                              &nvenc->engine);
+       if (ret)
+               return ret;
+
+       fwif = nvkm_firmware_load(&nvenc->engine.subdev, fwif, "Nvenc", nvenc);
+       if (IS_ERR(fwif))
+               return -ENODEV;
+
+       nvenc->func = fwif->func;
+
+       return nvkm_falcon_ctor(nvenc->func->flcn, &nvenc->engine.subdev,
+                               nvkm_subdev_name[index], 0, &nvenc->falcon);
+};

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/nvenc/gm107.c b/drivers/gpu/drm/nouveau/nvkm/engine/nvenc/gm107.c
new file mode 100644 (file)
index 0000000..e8a13ed
--- /dev/null
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/nvenc/gm107.c
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2019 Red Hat Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include "priv.h"
+
+static const struct nvkm_falcon_func
+gm107_nvenc_flcn = {
+       .load_imem = nvkm_falcon_v1_load_imem,
+       .load_dmem = nvkm_falcon_v1_load_dmem,
+       .read_dmem = nvkm_falcon_v1_read_dmem,
+       .bind_context = nvkm_falcon_v1_bind_context,
+       .wait_for_halt = nvkm_falcon_v1_wait_for_halt,
+       .clear_interrupt = nvkm_falcon_v1_clear_interrupt,
+       .set_start_addr = nvkm_falcon_v1_set_start_addr,
+       .start = nvkm_falcon_v1_start,
+       .enable = nvkm_falcon_v1_enable,
+       .disable = nvkm_falcon_v1_disable,
+};
+
+static const struct nvkm_nvenc_func
+gm107_nvenc = {
+       .flcn = &gm107_nvenc_flcn,
+};
+
+static int
+gm107_nvenc_nofw(struct nvkm_nvenc *nvenc, int ver,
+                const struct nvkm_nvenc_fwif *fwif)
+{
+       return 0;
+}
+
+static const struct nvkm_nvenc_fwif
+gm107_nvenc_fwif[] = {
+       { -1, gm107_nvenc_nofw, &gm107_nvenc },
+       {}
+};
+
+int
+gm107_nvenc_new(struct nvkm_device *device, int index,
+               struct nvkm_nvenc **pnvenc)
+{
+       return nvkm_nvenc_new_(gm107_nvenc_fwif, device, index, pnvenc);
+}

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/nvenc/priv.h b/drivers/gpu/drm/nouveau/nvkm/engine/nvenc/priv.h
new file mode 100644 (file)
index 0000000..100fa5e
--- /dev/null
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/nvenc/priv.h
@@ -0,0 +1,19 @@
+/* SPDX-License-Identifier: MIT */
+#ifndef __NVKM_NVENC_PRIV_H__
+#define __NVKM_NVENC_PRIV_H__
+#include <engine/nvenc.h>
+
+struct nvkm_nvenc_func {
+       const struct nvkm_falcon_func *flcn;
+};
+
+struct nvkm_nvenc_fwif {
+       int version;
+       int (*load)(struct nvkm_nvenc *, int ver,
+                   const struct nvkm_nvenc_fwif *);
+       const struct nvkm_nvenc_func *func;
+};
+
+int nvkm_nvenc_new_(const struct nvkm_nvenc_fwif *, struct nvkm_device *,
+                   int, struct nvkm_nvenc **pnvenc);
+#endif