drm/nouveau/bar: convert to new-style nvkm_subdev

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

diff --git a/drivers/gpu/drm/nouveau/include/nvif/device.h b/drivers/gpu/drm/nouveau/include/nvif/device.h
index 14da7ad..b36d48e 100644 (file)
--- a/drivers/gpu/drm/nouveau/include/nvif/device.h
+++ b/drivers/gpu/drm/nouveau/include/nvif/device.h
@@ -53,7 +53,7 @@ u64  nvif_device_time(struct nvif_device *);
 #define nvxx_bios(a) nvkm_bios(nvxx_device(a))
 #define nvxx_fb(a) nvkm_fb(nvxx_device(a))
 #define nvxx_mmu(a) nvkm_mmu(nvxx_device(a))
-#define nvxx_bar(a) nvkm_bar(nvxx_device(a))
+#define nvxx_bar(a) nvxx_device(a)->bar
 #define nvxx_gpio(a) nvkm_gpio(nvxx_device(a))
 #define nvxx_clk(a) nvkm_clk(nvxx_device(a))
 #define nvxx_i2c(a) nvkm_i2c(nvxx_device(a))

diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bar.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bar.h
index 1eaf7de..d3071b5 100644 (file)
--- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bar.h
+++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bar.h
@@ -1,28 +1,24 @@
 #ifndef __NVKM_BAR_H__
 #define __NVKM_BAR_H__
 #include <core/subdev.h>
-struct nvkm_mem;
 struct nvkm_vma;
 
 struct nvkm_bar {
+       const struct nvkm_bar_func *func;
        struct nvkm_subdev subdev;
 
-       struct nvkm_vm *(*kmap)(struct nvkm_bar *);
-       int  (*umap)(struct nvkm_bar *, u64 size, int type, struct nvkm_vma *);
-       void (*unmap)(struct nvkm_bar *, struct nvkm_vma *);
-       void (*flush)(struct nvkm_bar *);
+       spinlock_t lock;
 
        /* whether the BAR supports to be ioremapped WC or should be uncached */
        bool iomap_uncached;
 };
 
-static inline struct nvkm_bar *
-nvkm_bar(void *obj)
-{
-       return (void *)nvkm_subdev(obj, NVDEV_SUBDEV_BAR);
-}
+void nvkm_bar_flush(struct nvkm_bar *);
+struct nvkm_vm *nvkm_bar_kmap(struct nvkm_bar *);
+int nvkm_bar_umap(struct nvkm_bar *, u64 size, int type, struct nvkm_vma *);
 
-extern struct nvkm_oclass nv50_bar_oclass;
-extern struct nvkm_oclass gf100_bar_oclass;
-extern struct nvkm_oclass gk20a_bar_oclass;
+int nv50_bar_new(struct nvkm_device *, int, struct nvkm_bar **);
+int g84_bar_new(struct nvkm_device *, int, struct nvkm_bar **);
+int gf100_bar_new(struct nvkm_device *, int, struct nvkm_bar **);
+int gk20a_bar_new(struct nvkm_device *, int, struct nvkm_bar **);
 #endif

diff --cc drivers/gpu/drm/nouveau/nouveau_bo.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/engine/device/gf100.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/engine/device/gk104.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/engine/device/gm100.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/engine/device/nv50.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/engine/fifo/gf100.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/engine/sw/gf100.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/engine/sw/nv50.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/subdev/bar/Kbuild
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/subdev/bar/base.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/subdev/bar/g84.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/subdev/bar/gf100.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/subdev/bar/gf100.h
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/subdev/bar/gk20a.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/subdev/bar/nv50.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/subdev/bar/nv50.h
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/subdev/bar/priv.h
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/subdev/instmem/base.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv50.c
Simple merge