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 b4974505af054d999940bbb124e727d3c667c056..1fd0a07faadc915eb17e9d1f02e98f2f3b3ad102 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 --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c
index bd33d547d5740b5514b62a945ab437f434228b26..6024edf8529e5340c4a5b289b858405a52268164 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_bo.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
@@ -1351,6 +1351,7 @@ nouveau_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_mem_reg *mem)
 {
        struct ttm_mem_type_manager *man = &bdev->man[mem->mem_type];
        struct nouveau_drm *drm = nouveau_bdev(bdev);
+       struct nvkm_device *device = nvxx_device(&drm->device);
        struct nvkm_mem *node = mem->mm_node;
        int ret;
 
@@ -1379,7 +1380,7 @@ nouveau_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_mem_reg *mem)
                /* fallthrough, tiled memory */
        case TTM_PL_VRAM:
                mem->bus.offset = mem->start << PAGE_SHIFT;
-               mem->bus.base = nv_device_resource_start(nvxx_device(&drm->device), 1);
+               mem->bus.base = device->func->resource_addr(device, 1);
                mem->bus.is_iomem = true;
                if (drm->device.info.family >= NV_DEVICE_INFO_V0_TESLA) {
                        struct nvkm_bar *bar = nvxx_bar(&drm->device);
@@ -1419,8 +1420,8 @@ nouveau_ttm_fault_reserve_notify(struct ttm_buffer_object *bo)
 {
        struct nouveau_drm *drm = nouveau_bdev(bo->bdev);
        struct nouveau_bo *nvbo = nouveau_bo(bo);
-       struct nvif_device *device = &drm->device;
-       u32 mappable = nv_device_resource_len(nvxx_device(device), 1) >> PAGE_SHIFT;
+       struct nvkm_device *device = nvxx_device(&drm->device);
+       u32 mappable = device->func->resource_size(device, 1) >> PAGE_SHIFT;
        int i, ret;
 
        /* as long as the bo isn't in vram, and isn't tiled, we've got

diff --git a/drivers/gpu/drm/nouveau/nouveau_chan.c b/drivers/gpu/drm/nouveau/nouveau_chan.c
index 8c88c5e5bf0b243444623dcb3a30f80e2aadd4dc..f59c4f5716cc661ae2982af2bf922da55c6df279 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_chan.c
+++ b/drivers/gpu/drm/nouveau/nouveau_chan.c
@@ -150,7 +150,8 @@ nouveau_channel_prep(struct nouveau_drm *drm, struct nvif_device *device,
                         */
                        args.target = NV_DMA_V0_TARGET_PCI;
                        args.access = NV_DMA_V0_ACCESS_RDWR;
-                       args.start = nv_device_resource_start(nvxx_device(device), 1);
+                       args.start = nvxx_device(device)->func->
+                               resource_addr(nvxx_device(device), 1);
                        args.limit = args.start + device->info.ram_user - 1;
                } else {
                        args.target = NV_DMA_V0_TARGET_VRAM;

diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c
index 5553caa16b9cde1342ef42cdf2fed0e3a305023c..cc6c228e11c83566d1ac1a2c59fcefa959345463 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_display.c
+++ b/drivers/gpu/drm/nouveau/nouveau_display.c
@@ -445,6 +445,7 @@ int
 nouveau_display_create(struct drm_device *dev)
 {
        struct nouveau_drm *drm = nouveau_drm(dev);
+       struct nvkm_device *device = nvxx_device(&drm->device);
        struct nouveau_display *disp;
        int ret;
 
@@ -457,7 +458,7 @@ nouveau_display_create(struct drm_device *dev)
        drm_mode_create_dvi_i_properties(dev);
 
        dev->mode_config.funcs = &nouveau_mode_config_funcs;
-       dev->mode_config.fb_base = nv_device_resource_start(nvxx_device(&drm->device), 1);
+       dev->mode_config.fb_base = device->func->resource_addr(device, 1);
 
        dev->mode_config.min_width = 0;
        dev->mode_config.min_height = 0;

diff --git a/drivers/gpu/drm/nouveau/nouveau_ttm.c b/drivers/gpu/drm/nouveau/nouveau_ttm.c
index d8999f71a798816b8ef0f536f37412f2b4dd32df..1fd70d6900cf7f7cefc79e4e9e92a9fd7e777d51 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_ttm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_ttm.c
@@ -335,6 +335,7 @@ nouveau_ttm_global_release(struct nouveau_drm *drm)
 int
 nouveau_ttm_init(struct nouveau_drm *drm)
 {
+       struct nvkm_device *device = nvxx_device(&drm->device);
        struct drm_device *dev = drm->dev;
        u32 bits;
        int ret;
@@ -381,8 +382,8 @@ nouveau_ttm_init(struct nouveau_drm *drm)
                return ret;
        }
 
-       drm->ttm.mtrr = arch_phys_wc_add(nv_device_resource_start(nvxx_device(&drm->device), 1),
-                                        nv_device_resource_len(nvxx_device(&drm->device), 1));
+       drm->ttm.mtrr = arch_phys_wc_add(device->func->resource_addr(device, 1),
+                                        device->func->resource_size(device, 1));
 
        /* GART init */
        if (drm->agp.stat != ENABLED) {

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
index 5fab8384d1f47f48c071e5be519329f9a36c1264..b8d46144e68a6d4e8463282533050a0c5a0aef8b 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
@@ -2262,36 +2262,6 @@ fail:
        return ret;
 }
 
-resource_size_t
-nv_device_resource_start(struct nvkm_device *device, unsigned int bar)
-{
-       if (nv_device_is_pci(device)) {
-               return pci_resource_start(device->pdev, bar);
-       } else {
-               struct resource *res;
-               res = platform_get_resource(device->platformdev,
-                                           IORESOURCE_MEM, bar);
-               if (!res)
-                       return 0;
-               return res->start;
-       }
-}
-
-resource_size_t
-nv_device_resource_len(struct nvkm_device *device, unsigned int bar)
-{
-       if (nv_device_is_pci(device)) {
-               return pci_resource_len(device->pdev, bar);
-       } else {
-               struct resource *res;
-               res = platform_get_resource(device->platformdev,
-                                           IORESOURCE_MEM, bar);
-               if (!res)
-                       return 0;
-               return resource_size(res);
-       }
-}
-
 void
 nvkm_device_del(struct nvkm_device **pdevice)
 {
@@ -2363,8 +2333,8 @@ nvkm_device_ctor(const struct nvkm_device_func *func,
        if (ret)
                goto done;
 
-       mmio_base = nv_device_resource_start(device, 0);
-       mmio_size = nv_device_resource_len(device, 0);
+       mmio_base = device->func->resource_addr(device, 0);
+       mmio_size = device->func->resource_size(device, 0);
 
        /* identify the chipset, and determine classes of subdev/engines */
        if (detect) {

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/pci.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/pci.c
index 1a1d1e584a7f9fc265fbbfcd5d26e3b0203fad73..75612faaca2c629eda4916631491a5a93ac26ca2 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/device/pci.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/pci.c
@@ -30,6 +30,20 @@ nvkm_device_pci(struct nvkm_device *device)
        return container_of(device, struct nvkm_device_pci, device);
 }
 
+static resource_size_t
+nvkm_device_pci_resource_addr(struct nvkm_device *device, unsigned bar)
+{
+       struct nvkm_device_pci *pdev = nvkm_device_pci(device);
+       return pci_resource_start(pdev->pdev, bar);
+}
+
+static resource_size_t
+nvkm_device_pci_resource_size(struct nvkm_device *device, unsigned bar)
+{
+       struct nvkm_device_pci *pdev = nvkm_device_pci(device);
+       return pci_resource_len(pdev->pdev, bar);
+}
+
 static void
 nvkm_device_pci_fini(struct nvkm_device *device, bool suspend)
 {
@@ -68,6 +82,8 @@ nvkm_device_pci_func = {
        .dtor = nvkm_device_pci_dtor,
        .preinit = nvkm_device_pci_preinit,
        .fini = nvkm_device_pci_fini,
+       .resource_addr = nvkm_device_pci_resource_addr,
+       .resource_size = nvkm_device_pci_resource_size,
 };
 
 int

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c
index 2587a17981b2f3acd73ec33299c8ae8b84a2298b..f4bc11c1671feb231407bf13f640760c3c27a082 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c
@@ -26,9 +26,30 @@
 #include "priv.h"
 
 static struct nvkm_device_tegra *
-nvkm_device_tegra(struct nvkm_device *obj)
+nvkm_device_tegra(struct nvkm_device *device)
 {
-       return container_of(obj, struct nvkm_device_tegra, device);
+       return container_of(device, struct nvkm_device_tegra, device);
+}
+
+static struct resource *
+nvkm_device_tegra_resource(struct nvkm_device *device, unsigned bar)
+{
+       struct nvkm_device_tegra *tdev = nvkm_device_tegra(device);
+       return platform_get_resource(tdev->pdev, IORESOURCE_MEM, bar);
+}
+
+static resource_size_t
+nvkm_device_tegra_resource_addr(struct nvkm_device *device, unsigned bar)
+{
+       struct resource *res = nvkm_device_tegra_resource(device, bar);
+       return res ? res->start : 0;
+}
+
+static resource_size_t
+nvkm_device_tegra_resource_size(struct nvkm_device *device, unsigned bar)
+{
+       struct resource *res = nvkm_device_tegra_resource(device, bar);
+       return res ? resource_size(res) : 0;
 }
 
 static irqreturn_t
@@ -79,6 +100,8 @@ nvkm_device_tegra_func = {
        .tegra = nvkm_device_tegra,
        .init = nvkm_device_tegra_init,
        .fini = nvkm_device_tegra_fini,
+       .resource_addr = nvkm_device_tegra_resource_addr,
+       .resource_size = nvkm_device_tegra_resource_size,
 };
 
 int

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/user.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/user.c
index a948960cc0566987029e1f0aa413ca6536650e15..eddf9b1d3340c1fb634708f5bc62a15bbd417793 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/device/user.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/user.c
@@ -198,8 +198,8 @@ nvkm_udevice_map(struct nvkm_object *object, u64 *addr, u32 *size)
 {
        struct nvkm_udevice *udev = nvkm_udevice(object);
        struct nvkm_device *device = udev->device;
-       *addr = nv_device_resource_start(device, 0);
-       *size = nv_device_resource_len(device, 0);
+       *addr = device->func->resource_addr(device, 0);
+       *size = device->func->resource_size(device, 0);
        return 0;
 }
 

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/channv50.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/channv50.c
index c9cbfbd2a1aefb09166e773cd5da88cb36cb1faf..01803c0679b682904672748b985f2e1bd02bb0b8 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/channv50.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/channv50.c
@@ -195,7 +195,7 @@ nv50_disp_chan_map(struct nvkm_object *object, u64 *addr, u32 *size)
        struct nv50_disp_chan *chan = nv50_disp_chan(object);
        struct nv50_disp *disp = chan->root->disp;
        struct nvkm_device *device = disp->base.engine.subdev.device;
-       *addr = nv_device_resource_start(device, 0) +
+       *addr = device->func->resource_addr(device, 0) +
                0x640000 + (chan->chid * 0x1000);
        *size = 0x001000;
        return 0;

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/chan.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/chan.c
index 9921482fc162487ffc514e55cf47542d7e9e0a7d..dc6d4678f22850ac72d1b2db8c5558b5e7270b10 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/chan.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/chan.c
@@ -406,7 +406,7 @@ nvkm_fifo_chan_ctor(const struct nvkm_fifo_chan_func *func,
        spin_unlock_irqrestore(&fifo->lock, flags);
 
        /* determine address of this channel's user registers */
-       chan->addr = nv_device_resource_start(device, bar) +
+       chan->addr = device->func->resource_addr(device, bar) +
                     base + user * chan->chid;
        chan->size = user;
 

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv20.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv20.c
index 32ea28a71a412e0013a760c3a2208bd5b5fe4aaa..5caef65d3c6ebd1dc86b7bd2db6bbd3f79e88857 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv20.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv20.c
@@ -296,7 +296,7 @@ nv20_gr_init(struct nvkm_gr *base)
        nvkm_wr32(device, NV10_PGRAPH_SURFACE, tmp);
 
        /* begin RAM config */
-       vramsz = nv_device_resource_len(device, 1) - 1;
+       vramsz = device->func->resource_size(device, 1) - 1;
        nvkm_wr32(device, 0x4009A4, nvkm_rd32(device, 0x100200));
        nvkm_wr32(device, 0x4009A8, nvkm_rd32(device, 0x100204));
        nvkm_wr32(device, NV10_PGRAPH_RDI_INDEX, 0x00EA0000);

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv40.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv40.c
index 7987df18415b582bc09ec825bfd5710bec0055b4..ffa902ece87234420d2b25d1603995f5679b5245 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv40.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv40.c
@@ -385,7 +385,7 @@ nv40_gr_init(struct nvkm_gr *base)
        }
 
        /* begin RAM config */
-       vramsz = nv_device_resource_len(device, 1) - 1;
+       vramsz = device->func->resource_size(device, 1) - 1;
        switch (device->chipset) {
        case 0x40:
                nvkm_wr32(device, 0x4009A4, nvkm_rd32(device, 0x100200));

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/bar/gf100.c b/drivers/gpu/drm/nouveau/nvkm/subdev/bar/gf100.c
index 2eb0a370a3a0ef5ea8aaf40b0e35824d7722412b..c794b2c2d21e710faa3ac64f70ac970ae69826c9 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/bar/gf100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/bar/gf100.c
@@ -58,7 +58,7 @@ gf100_bar_ctor_vm(struct gf100_bar *bar, struct gf100_bar_vm *bar_vm,
        if (ret)
                return ret;
 
-       bar_len = nv_device_resource_len(device, bar_nr);
+       bar_len = device->func->resource_size(device, bar_nr);
 
        ret = nvkm_vm_new(device, 0, bar_len, 0, key, &vm);
        if (ret)

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/bar/nv50.c b/drivers/gpu/drm/nouveau/nvkm/subdev/bar/nv50.c
index fac54f97217e58962fb265069b5c10255ccfb6c5..370dcd8ff7b5abd0f0c3424a8783dcc6acbffee3 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/bar/nv50.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/bar/nv50.c
@@ -82,7 +82,7 @@ nv50_bar_oneinit(struct nvkm_bar *base)
 
        /* BAR3 */
        start = 0x0100000000ULL;
-       limit = start + nv_device_resource_len(device, 3);
+       limit = start + device->func->resource_size(device, 3);
 
        ret = nvkm_vm_new(device, start, limit, start, &bar3_lock, &vm);
        if (ret)
@@ -115,7 +115,7 @@ nv50_bar_oneinit(struct nvkm_bar *base)
 
        /* BAR1 */
        start = 0x0000000000ULL;
-       limit = start + nv_device_resource_len(device, 1);
+       limit = start + device->func->resource_size(device, 1);
 
        ret = nvkm_vm_new(device, start, limit--, start, &bar1_lock, &vm);
        if (ret)

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/fbmem.h b/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/fbmem.h
index 4e484c40b5c63babf8ab21f30b8517da6e2cce62..6c5bbff12eb4973317b1932fe5a605f4bc62cc3c 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/fbmem.h
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/fbmem.h
@@ -47,8 +47,8 @@
 static inline struct io_mapping *
 fbmem_init(struct nvkm_device *dev)
 {
-       return io_mapping_create_wc(nv_device_resource_start(dev, 1),
-                                   nv_device_resource_len(dev, 1));
+       return io_mapping_create_wc(dev->func->resource_addr(dev, 1),
+                                   dev->func->resource_size(dev, 1));
 }
 
 static inline void

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv40.c b/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv40.c
index a170ff9b32e754441ae39be8c5bd5b2dc6b73445..c0543875e4904def189f51dd67f3aa13f6aa79ba 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv40.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv40.c
@@ -243,13 +243,13 @@ nv40_instmem_new(struct nvkm_device *device, int index,
        *pimem = &imem->base;
 
        /* map bar */
-       if (nv_device_resource_len(device, 2))
+       if (device->func->resource_size(device, 2))
                bar = 2;
        else
                bar = 3;
 
-       imem->iomem = ioremap(nv_device_resource_start(device, bar),
-                             nv_device_resource_len(device, bar));
+       imem->iomem = ioremap(device->func->resource_addr(device, bar),
+                             device->func->resource_size(device, bar));
        if (!imem->iomem) {
                nvkm_error(&imem->base.subdev, "unable to map PRAMIN BAR\n");
                return -EFAULT;

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv50.c b/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv50.c
index ec5020e3fc42ed2f30136d0f6f39f6c12728400a..6d512c062ae32923543cb994d1d7aeabba637b6e 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv50.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv50.c
@@ -81,7 +81,7 @@ nv50_instobj_boot(struct nvkm_memory *memory, struct nvkm_vm *vm)
 
        ret = nvkm_vm_get(vm, size, 12, NV_MEM_ACCESS_RW, &iobj->bar);
        if (ret == 0) {
-               map = ioremap(nv_device_resource_start(device, 3) +
+               map = ioremap(device->func->resource_addr(device, 3) +
                              (u32)iobj->bar.offset, size);
                if (map) {
                        nvkm_memory_map(memory, &iobj->bar, 0);