drm/nouveau/fb: 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 230ee81..2b17b13 100644 (file)
--- a/drivers/gpu/drm/nouveau/include/nvif/device.h
+++ b/drivers/gpu/drm/nouveau/include/nvif/device.h
@@ -51,7 +51,7 @@ u64  nvif_device_time(struct nvif_device *);
        nv_device(_device->object.priv);                                       \
 })
 #define nvxx_bios(a) nvxx_device(a)->bios
-#define nvxx_fb(a) nvkm_fb(nvxx_device(a))
+#define nvxx_fb(a) nvxx_device(a)->fb
 #define nvxx_mmu(a) nvkm_mmu(nvxx_device(a))
 #define nvxx_bar(a) nvxx_device(a)->bar
 #define nvxx_gpio(a) nvkm_gpio(nvxx_device(a))

diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h
index f102cf9..85ab72c 100644 (file)
--- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h
+++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h
@@ -46,59 +46,47 @@ struct nvkm_fb_tile {
 };
 
 struct nvkm_fb {
+       const struct nvkm_fb_func *func;
        struct nvkm_subdev subdev;
 
-       bool (*memtype_valid)(struct nvkm_fb *, u32 memtype);
-
        struct nvkm_ram *ram;
 
        struct {
                struct nvkm_fb_tile region[16];
                int regions;
-               void (*init)(struct nvkm_fb *, int i, u32 addr, u32 size,
-                            u32 pitch, u32 flags, struct nvkm_fb_tile *);
-               void (*comp)(struct nvkm_fb *, int i, u32 size, u32 flags,
-                            struct nvkm_fb_tile *);
-               void (*fini)(struct nvkm_fb *, int i, struct nvkm_fb_tile *);
-               void (*prog)(struct nvkm_fb *, int i, struct nvkm_fb_tile *);
        } tile;
 };
 
-static inline struct nvkm_fb *
-nvkm_fb(void *obj)
-{
-       /* fbram uses this before device subdev pointer is valid */
-       if (nv_iclass(obj, NV_SUBDEV_CLASS) &&
-           nv_subidx(obj) == NVDEV_SUBDEV_FB)
-               return obj;
-
-       return (void *)nvkm_subdev(obj, NVDEV_SUBDEV_FB);
-}
-
-extern struct nvkm_oclass *nv04_fb_oclass;
-extern struct nvkm_oclass *nv10_fb_oclass;
-extern struct nvkm_oclass *nv1a_fb_oclass;
-extern struct nvkm_oclass *nv20_fb_oclass;
-extern struct nvkm_oclass *nv25_fb_oclass;
-extern struct nvkm_oclass *nv30_fb_oclass;
-extern struct nvkm_oclass *nv35_fb_oclass;
-extern struct nvkm_oclass *nv36_fb_oclass;
-extern struct nvkm_oclass *nv40_fb_oclass;
-extern struct nvkm_oclass *nv41_fb_oclass;
-extern struct nvkm_oclass *nv44_fb_oclass;
-extern struct nvkm_oclass *nv46_fb_oclass;
-extern struct nvkm_oclass *nv47_fb_oclass;
-extern struct nvkm_oclass *nv49_fb_oclass;
-extern struct nvkm_oclass *nv4e_fb_oclass;
-extern struct nvkm_oclass *nv50_fb_oclass;
-extern struct nvkm_oclass *g84_fb_oclass;
-extern struct nvkm_oclass *gt215_fb_oclass;
-extern struct nvkm_oclass *mcp77_fb_oclass;
-extern struct nvkm_oclass *mcp89_fb_oclass;
-extern struct nvkm_oclass *gf100_fb_oclass;
-extern struct nvkm_oclass *gk104_fb_oclass;
-extern struct nvkm_oclass *gk20a_fb_oclass;
-extern struct nvkm_oclass *gm107_fb_oclass;
+bool nvkm_fb_memtype_valid(struct nvkm_fb *, u32 memtype);
+void nvkm_fb_tile_init(struct nvkm_fb *, int region, u32 addr, u32 size,
+                      u32 pitch, u32 flags, struct nvkm_fb_tile *);
+void nvkm_fb_tile_fini(struct nvkm_fb *, int region, struct nvkm_fb_tile *);
+void nvkm_fb_tile_prog(struct nvkm_fb *, int region, struct nvkm_fb_tile *);
+
+int nv04_fb_new(struct nvkm_device *, int, struct nvkm_fb **);
+int nv10_fb_new(struct nvkm_device *, int, struct nvkm_fb **);
+int nv1a_fb_new(struct nvkm_device *, int, struct nvkm_fb **);
+int nv20_fb_new(struct nvkm_device *, int, struct nvkm_fb **);
+int nv25_fb_new(struct nvkm_device *, int, struct nvkm_fb **);
+int nv30_fb_new(struct nvkm_device *, int, struct nvkm_fb **);
+int nv35_fb_new(struct nvkm_device *, int, struct nvkm_fb **);
+int nv36_fb_new(struct nvkm_device *, int, struct nvkm_fb **);
+int nv40_fb_new(struct nvkm_device *, int, struct nvkm_fb **);
+int nv41_fb_new(struct nvkm_device *, int, struct nvkm_fb **);
+int nv44_fb_new(struct nvkm_device *, int, struct nvkm_fb **);
+int nv46_fb_new(struct nvkm_device *, int, struct nvkm_fb **);
+int nv47_fb_new(struct nvkm_device *, int, struct nvkm_fb **);
+int nv49_fb_new(struct nvkm_device *, int, struct nvkm_fb **);
+int nv4e_fb_new(struct nvkm_device *, int, struct nvkm_fb **);
+int nv50_fb_new(struct nvkm_device *, int, struct nvkm_fb **);
+int g84_fb_new(struct nvkm_device *, int, struct nvkm_fb **);
+int gt215_fb_new(struct nvkm_device *, int, struct nvkm_fb **);
+int mcp77_fb_new(struct nvkm_device *, int, struct nvkm_fb **);
+int mcp89_fb_new(struct nvkm_device *, int, struct nvkm_fb **);
+int gf100_fb_new(struct nvkm_device *, int, struct nvkm_fb **);
+int gk104_fb_new(struct nvkm_device *, int, struct nvkm_fb **);
+int gk20a_fb_new(struct nvkm_device *, int, struct nvkm_fb **);
+int gm107_fb_new(struct nvkm_device *, int, struct nvkm_fb **);
 
 #include <subdev/bios.h>
 #include <subdev/bios/ramcfg.h>

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

diff --cc drivers/gpu/drm/nouveau/nouveau_gem.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/nv04.c
Simple merge

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

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

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

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

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

diff --cc drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxnv50.c
Simple merge

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

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

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

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

diff --cc drivers/gpu/drm/nouveau/nvkm/subdev/fb/gk104.c
Simple merge

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

diff --cc drivers/gpu/drm/nouveau/nvkm/subdev/fb/gm107.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/subdev/fb/gt215.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/subdev/fb/mcp77.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/subdev/fb/mcp89.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv04.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv04.h
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv10.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv1a.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv20.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv25.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv30.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv35.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv36.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv40.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv41.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv44.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv46.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv47.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv49.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/subdev/fb/nv4e.c
Simple merge

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

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

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

diff --cc drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramfuc.h
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgk104.c
Simple merge

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