drm/nouveau/device: cleaner abstraction for device resource functions

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

diff --git a/drivers/gpu/drm/nouveau/include/nvkm/core/device.h b/drivers/gpu/drm/nouveau/include/nvkm/core/device.h
index b497450..1fd0a07 100644 (file)
--- a/drivers/gpu/drm/nouveau/include/nvkm/core/device.h
+++ b/drivers/gpu/drm/nouveau/include/nvkm/core/device.h
@@ -148,6 +148,8 @@ struct nvkm_device_func {
        int (*preinit)(struct nvkm_device *);
        int (*init)(struct nvkm_device *);
        void (*fini)(struct nvkm_device *, bool suspend);
+       resource_size_t (*resource_addr)(struct nvkm_device *, unsigned bar);
+       resource_size_t (*resource_size)(struct nvkm_device *, unsigned bar);
 };
 
 struct nvkm_device_quirk {
@@ -242,12 +244,6 @@ nv_device_base(struct nvkm_device *device)
                                          &device->platformdev->dev;
 }
 
-resource_size_t
-nv_device_resource_start(struct nvkm_device *device, unsigned int bar);
-
-resource_size_t
-nv_device_resource_len(struct nvkm_device *device, unsigned int bar);
-
 struct platform_device;
 
 enum nv_bus_type {

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

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

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

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

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

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

diff --cc drivers/gpu/drm/nouveau/nvkm/engine/disp/channv50.c
Simple merge

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

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

diff --cc drivers/gpu/drm/nouveau/nvkm/engine/gr/nv40.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/nv50.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/subdev/devinit/fbmem.h
Simple merge

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

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