drm/nouveau/ce/gm107: expose MaxwellDmaCopyA

The HW accepts KeplerDmaCopyA and MaxwellDmaCopyA classes.

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

diff --git a/drivers/gpu/drm/nouveau/include/nvkm/engine/ce.h b/drivers/gpu/drm/nouveau/include/nvkm/engine/ce.h
index 48745f26ab45f8560ea1bfde40e2f77d0ac3aa55..594d719ba41e81edd21f8b079d8f6bfbd85a7a6a 100644 (file)
--- a/drivers/gpu/drm/nouveau/include/nvkm/engine/ce.h
+++ b/drivers/gpu/drm/nouveau/include/nvkm/engine/ce.h
@@ -5,5 +5,6 @@
 int gt215_ce_new(struct nvkm_device *, int, struct nvkm_engine **);
 int gf100_ce_new(struct nvkm_device *, int, struct nvkm_engine **);
 int gk104_ce_new(struct nvkm_device *, int, struct nvkm_engine **);
+int gm107_ce_new(struct nvkm_device *, int, struct nvkm_engine **);
 int gm200_ce_new(struct nvkm_device *, int, struct nvkm_engine **);
 #endif

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/ce/Kbuild b/drivers/gpu/drm/nouveau/nvkm/engine/ce/Kbuild
index 5bfa730f3cf2afeec651213b363e8d22e500fff2..9c19d59b47df60b0c5ec79661b096052cc259ddc 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/ce/Kbuild
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/ce/Kbuild
@@ -1,4 +1,5 @@
 nvkm-y += nvkm/engine/ce/gt215.o
 nvkm-y += nvkm/engine/ce/gf100.o
 nvkm-y += nvkm/engine/ce/gk104.o
+nvkm-y += nvkm/engine/ce/gm107.o
 nvkm-y += nvkm/engine/ce/gm200.o

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/ce/gm107.c b/drivers/gpu/drm/nouveau/nvkm/engine/ce/gm107.c
new file mode 100644 (file)
index 0000000..4c2f429
--- /dev/null
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/ce/gm107.c
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2016 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.
+ *
+ * Authors: Ben Skeggs
+ */
+#include "priv.h"
+
+#include <nvif/class.h>
+
+static const struct nvkm_engine_func
+gm107_ce = {
+       .intr = gk104_ce_intr,
+       .sclass = {
+               { -1, -1, KEPLER_DMA_COPY_A },
+               { -1, -1, MAXWELL_DMA_COPY_A },
+               {}
+       }
+};
+
+int
+gm107_ce_new(struct nvkm_device *device, int index,
+            struct nvkm_engine **pengine)
+{
+       if (index == NVKM_ENGINE_CE0) {
+               return nvkm_engine_new_(&gm107_ce, device, index,
+                                       0x00000040, true, pengine);
+       } else
+       if (index == NVKM_ENGINE_CE1) {
+               return nvkm_engine_new_(&gm107_ce, device, index,
+                                       0x00000080, true, pengine);
+       } else
+       if (index == NVKM_ENGINE_CE2) {
+               return nvkm_engine_new_(&gm107_ce, device, index,
+                                       0x00200000, true, pengine);
+       }
+       return -ENODEV;
+}

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
index 93436c6c489a3b889e0c138c59ad9bb87639cde2..0a7b0779949ffd4e64881dec9afda4a86d0c57f5 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
@@ -1970,8 +1970,8 @@ nv117_chipset = {
        .therm = gm107_therm_new,
        .timer = gk20a_timer_new,
        .volt = gk104_volt_new,
-       .ce[0] = gk104_ce_new,
-       .ce[2] = gk104_ce_new,
+       .ce[0] = gm107_ce_new,
+       .ce[2] = gm107_ce_new,
        .disp = gm107_disp_new,
        .dma = gf119_dma_new,
        .fifo = gm107_fifo_new,