drm/nouveau/mmu/gp100: fork from gf100

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

diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/mmu.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/mmu.h
index 805d36b049b83b0d4099ae7040656ab80c489669..87baa5e9691c4710e0ab1f1e1b56de2c577da10e 100644 (file)
--- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/mmu.h
+++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/mmu.h
@@ -73,4 +73,5 @@ int gk104_mmu_new(struct nvkm_device *, int, struct nvkm_mmu **);
 int gk20a_mmu_new(struct nvkm_device *, int, struct nvkm_mmu **);
 int gm200_mmu_new(struct nvkm_device *, int, struct nvkm_mmu **);
 int gm20b_mmu_new(struct nvkm_device *, int, struct nvkm_mmu **);
+int gp100_mmu_new(struct nvkm_device *, int, struct nvkm_mmu **);
 #endif

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
index d99093435c2538a868457173e1997fca9e1c04c5..e146436156985a534fa14e0829db4560d6eb1459 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
@@ -2168,7 +2168,7 @@ nv130_chipset = {
        .imem = nv50_instmem_new,
        .ltc = gp100_ltc_new,
        .mc = gp100_mc_new,
-       .mmu = gf100_mmu_new,
+       .mmu = gp100_mmu_new,
        .therm = gp100_therm_new,
        .secboot = gm200_secboot_new,
        .pci = gp100_pci_new,
@@ -2203,7 +2203,7 @@ nv132_chipset = {
        .imem = nv50_instmem_new,
        .ltc = gp100_ltc_new,
        .mc = gp100_mc_new,
-       .mmu = gf100_mmu_new,
+       .mmu = gp100_mmu_new,
        .therm = gp100_therm_new,
        .secboot = gp102_secboot_new,
        .pci = gp100_pci_new,
@@ -2238,7 +2238,7 @@ nv134_chipset = {
        .imem = nv50_instmem_new,
        .ltc = gp100_ltc_new,
        .mc = gp100_mc_new,
-       .mmu = gf100_mmu_new,
+       .mmu = gp100_mmu_new,
        .therm = gp100_therm_new,
        .secboot = gp102_secboot_new,
        .pci = gp100_pci_new,
@@ -2273,7 +2273,7 @@ nv136_chipset = {
        .imem = nv50_instmem_new,
        .ltc = gp100_ltc_new,
        .mc = gp100_mc_new,
-       .mmu = gf100_mmu_new,
+       .mmu = gp100_mmu_new,
        .therm = gp100_therm_new,
        .secboot = gp102_secboot_new,
        .pci = gp100_pci_new,
@@ -2308,7 +2308,7 @@ nv137_chipset = {
        .imem = nv50_instmem_new,
        .ltc = gp100_ltc_new,
        .mc = gp100_mc_new,
-       .mmu = gf100_mmu_new,
+       .mmu = gp100_mmu_new,
        .therm = gp100_therm_new,
        .secboot = gp102_secboot_new,
        .pci = gp100_pci_new,
@@ -2343,7 +2343,7 @@ nv138_chipset = {
        .imem = nv50_instmem_new,
        .ltc = gp100_ltc_new,
        .mc = gp100_mc_new,
-       .mmu = gf100_mmu_new,
+       .mmu = gp100_mmu_new,
        .therm = gp100_therm_new,
        .pci = gp100_pci_new,
        .pmu = gp102_pmu_new,

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/Kbuild b/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/Kbuild
index 278041ffc940f348dd704068114eeff3e0b8c550..7d63089aede09d7e1568d9636948fee1036cd072 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/Kbuild
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/Kbuild
@@ -9,3 +9,4 @@ nvkm-y += nvkm/subdev/mmu/gk104.o
 nvkm-y += nvkm/subdev/mmu/gk20a.o
 nvkm-y += nvkm/subdev/mmu/gm200.o
 nvkm-y += nvkm/subdev/mmu/gm20b.o
+nvkm-y += nvkm/subdev/mmu/gp100.o

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/gp100.c b/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/gp100.c
new file mode 100644 (file)
index 0000000..6cfd325
--- /dev/null
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/gp100.c
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2017 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_mmu_func
+gp100_mmu = {
+       .limit = (1ULL << 40),
+       .dma_bits = 40,
+       .pgt_bits  = 27 - 12,
+       .spg_shift = 12,
+       .lpg_shift = 17,
+       .create = gf100_vm_create,
+       .map_pgt = gf100_vm_map_pgt,
+       .map = gf100_vm_map,
+       .map_sg = gf100_vm_map_sg,
+       .unmap = gf100_vm_unmap,
+       .flush = gf100_vm_flush,
+};
+
+int
+gp100_mmu_new(struct nvkm_device *device, int index, struct nvkm_mmu **pmmu)
+{
+       return nvkm_mmu_new_(&gp100_mmu, device, index, pmmu);
+}