These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / gpu / drm / nouveau / nvkm / engine / dma / gf100.c

diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/mc/nv40.c b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/dma/gf100.c
similarity index 72%
rename from kernel/drivers/gpu/drm/nouveau/nvkm/subdev/mc/nv40.c
rename to kernel/drivers/gpu/drm/nouveau/nvkm/engine/dma/gf100.c
index b761305..efec5d3 100644 (file)
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/mc/nv40.c
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/dma/gf100.c
@@ -21,24 +21,16 @@
  *
  * Authors: Ben Skeggs
  */
-#include "nv04.h"
+#include "priv.h"
+#include "user.h"
 
-void
-nv40_mc_msi_rearm(struct nvkm_mc *pmc)
+static const struct nvkm_dma_func
+gf100_dma = {
+       .class_new = gf100_dmaobj_new,
+};
+
+int
+gf100_dma_new(struct nvkm_device *device, int index, struct nvkm_dma **pdma)
 {
-       struct nv04_mc_priv *priv = (void *)pmc;
-       nv_wr08(priv, 0x088068, 0xff);
+       return nvkm_dma_new_(&gf100_dma, device, index, pdma);
 }
-
-struct nvkm_oclass *
-nv40_mc_oclass = &(struct nvkm_mc_oclass) {
-       .base.handle = NV_SUBDEV(MC, 0x40),
-       .base.ofuncs = &(struct nvkm_ofuncs) {
-               .ctor = nv04_mc_ctor,
-               .dtor = _nvkm_mc_dtor,
-               .init = nv04_mc_init,
-               .fini = _nvkm_mc_fini,
-       },
-       .intr = nv04_mc_intr,
-       .msi_rearm = nv40_mc_msi_rearm,
-}.base;