On Wed, Aug 4, 2010 at 4:48 PM, Jordan Crouse <jcrouse@xxxxxxxxxxxxxx> wrote:
> Remove the drm_resource wrappers and directly use the
> actual PCI and/or platform functions in their place.
>
> Signed-off-by: Jordan Crouse <jcrouse@xxxxxxxxxxxxxx>
> ---
> drivers/gpu/drm/drm_bufs.c | 13 -------------
> drivers/gpu/drm/i915/i915_dma.c | 6 +++---
> drivers/gpu/drm/mga/mga_dma.c | 4 ++--
> drivers/gpu/drm/nouveau/nouveau_bo.c | 2 +-
> drivers/gpu/drm/nouveau/nouveau_channel.c | 3 ++-
> drivers/gpu/drm/nouveau/nouveau_mem.c | 16 +++++++++-------
> drivers/gpu/drm/nouveau/nv20_graph.c | 4 ++--
> drivers/gpu/drm/nouveau/nv40_graph.c | 2 +-
> drivers/gpu/drm/nouveau/nv50_instmem.c | 3 ++-
> drivers/gpu/drm/radeon/evergreen.c | 4 ++--
> drivers/gpu/drm/radeon/r100.c | 4 ++--
> drivers/gpu/drm/radeon/r600.c | 4 ++--
> drivers/gpu/drm/radeon/radeon_bios.c | 2 +-
> drivers/gpu/drm/radeon/radeon_cp.c | 8 ++++----
> drivers/gpu/drm/radeon/radeon_device.c | 4 ++--
> drivers/gpu/drm/radeon/rs600.c | 4 ++--
> drivers/gpu/drm/radeon/rs690.c | 4 ++--
> drivers/gpu/drm/radeon/rv770.c | 4 ++--
> drivers/gpu/drm/savage/savage_bci.c | 24 +++++++++++++-----------
> include/drm/drmP.h | 4 ----
> 20 files changed, 54 insertions(+), 65 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c
> index 2092e7b..3c2c663 100644
> --- a/drivers/gpu/drm/drm_bufs.c
> +++ b/drivers/gpu/drm/drm_bufs.c
> @@ -39,19 +39,6 @@
> #include <asm/shmparam.h>
> #include "drmP.h"
>
> -resource_size_t drm_get_resource_start(struct drm_device *dev, unsigned int resource)
> -{
> - return pci_resource_start(dev->pdev, resource);
> -}
> -EXPORT_SYMBOL(drm_get_resource_start);
> -
> -resource_size_t drm_get_resource_len(struct drm_device *dev, unsigned int resource)
> -{
> - return pci_resource_len(dev->pdev, resource);
> -}
> -
> -EXPORT_SYMBOL(drm_get_resource_len);
> -
> static struct drm_map_list *drm_find_matching_map(struct drm_device *dev,
> struct drm_local_map *map)
> {
> diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
> index 2305a12..a7bc699 100644
> --- a/drivers/gpu/drm/i915/i915_dma.c
> +++ b/drivers/gpu/drm/i915/i915_dma.c
> @@ -1354,7 +1354,7 @@ static int i915_load_modeset_init(struct drm_device *dev,
> int fb_bar = IS_I9XX(dev) ? 2 : 0;
> int ret = 0;
>
> - dev->mode_config.fb_base = drm_get_resource_start(dev, fb_bar) &
> + dev->mode_config.fb_base = pci_resource_start(dev->pdev, fb_bar) &
> 0xff000000;
>
> /* Basic memrange allocator for stolen space (aka vram) */
> @@ -2063,8 +2063,8 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
>
> /* Add register map (needed for suspend/resume) */
> mmio_bar = IS_I9XX(dev) ? 0 : 1;
> - base = drm_get_resource_start(dev, mmio_bar);
> - size = drm_get_resource_len(dev, mmio_bar);
> + base = pci_resource_start(dev->pdev, mmio_bar);
> + size = pci_resource_len(dev->pdev, mmio_bar);
>
> if (i915_get_bridge_dev(dev)) {
> ret = -EIO;
> diff --git a/drivers/gpu/drm/mga/mga_dma.c b/drivers/gpu/drm/mga/mga_dma.c
> index 3c917fb..ccc129c 100644
> --- a/drivers/gpu/drm/mga/mga_dma.c
> +++ b/drivers/gpu/drm/mga/mga_dma.c
> @@ -405,8 +405,8 @@ int mga_driver_load(struct drm_device * dev, unsigned long flags)
> dev_priv->usec_timeout = MGA_DEFAULT_USEC_TIMEOUT;
> dev_priv->chipset = flags;
>
> - dev_priv->mmio_base = drm_get_resource_start(dev, 1);
> - dev_priv->mmio_size = drm_get_resource_len(dev, 1);
> + dev_priv->mmio_base = pci_resource_start(dev->pdev, 1);
> + dev_priv->mmio_size = pci_resource_len(dev->pdev, 1);
>
> dev->counters += 3;
> dev->types[6] = _DRM_STAT_IRQ;
> diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c
> index 6f3c195..1dad392 100644
> --- a/drivers/gpu/drm/nouveau/nouveau_bo.c
> +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
> @@ -783,7 +783,7 @@ nouveau_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_mem_reg *mem)
> break;
> case TTM_PL_VRAM:
> mem->bus.offset = mem->mm_node->start << PAGE_SHIFT;
> - mem->bus.base = drm_get_resource_start(dev, 1);
> + man->bus.base = pci_resource_start(dev->pdev, 1);
> mem->bus.is_iomem = true;
> break;
> default:
> diff --git a/drivers/gpu/drm/nouveau/nouveau_channel.c b/drivers/gpu/drm/nouveau/nouveau_channel.c
> index 1fc57ef..06555c7 100644
> --- a/drivers/gpu/drm/nouveau/nouveau_channel.c
> +++ b/drivers/gpu/drm/nouveau/nouveau_channel.c
> @@ -62,7 +62,8 @@ nouveau_channel_pushbuf_ctxdma_init(struct nouveau_channel *chan)
> * VRAM.
> */
> ret = nouveau_gpuobj_dma_new(chan, NV_CLASS_DMA_IN_MEMORY,
> - drm_get_resource_start(dev, 1),
> + pci_resource_start(dev->pdev,
> + 1),
> dev_priv->fb_available_size,
> NV_DMA_ACCESS_RO,
> NV_DMA_TARGET_PCI, &pushbuf);
> diff --git a/drivers/gpu/drm/nouveau/nouveau_mem.c b/drivers/gpu/drm/nouveau/nouveau_mem.c
> index c1fd42b..fb6b791 100644
> --- a/drivers/gpu/drm/nouveau/nouveau_mem.c
> +++ b/drivers/gpu/drm/nouveau/nouveau_mem.c
> @@ -471,8 +471,9 @@ void nouveau_mem_close(struct drm_device *dev)
> }
>
> if (dev_priv->fb_mtrr) {
> - drm_mtrr_del(dev_priv->fb_mtrr, drm_get_resource_start(dev, 1),
> - drm_get_resource_len(dev, 1), DRM_MTRR_WC);
> + drm_mtrr_del(dev_priv->fb_mtrr,
> + pci_resource_start(dev->pdev, 1),
> + pci_resource_len(dev->pdev, 1), DRM_MTRR_WC);
> dev_priv->fb_mtrr = 0;
> }
> }
> @@ -633,7 +634,7 @@ nouveau_mem_init(struct drm_device *dev)
> struct ttm_bo_device *bdev = &dev_priv->ttm.bdev;
> int ret, dma_bits = 32;
>
> - dev_priv->fb_phys = drm_get_resource_start(dev, 1);
> + dev_priv->fb_phys = pci_resource_start(dev->pdev, 1);
> dev_priv->gart_info.type = NOUVEAU_GART_NONE;
>
> if (dev_priv->card_type >= NV_50 &&
> @@ -665,8 +666,9 @@ nouveau_mem_init(struct drm_device *dev)
>
> dev_priv->fb_available_size = dev_priv->vram_size;
> dev_priv->fb_mappable_pages = dev_priv->fb_available_size;
> - if (dev_priv->fb_mappable_pages > drm_get_resource_len(dev, 1))
> - dev_priv->fb_mappable_pages = drm_get_resource_len(dev, 1);
> + if (dev_priv->fb_mappable_pages > pci_resource_len(dev->pdev, 1))
> + dev_priv->fb_mappable_pages =
> + pci_resource_len(dev->pdev, 1);
> dev_priv->fb_mappable_pages >>= PAGE_SHIFT;
>
> /* remove reserved space at end of vram from available amount */
> @@ -718,8 +720,8 @@ nouveau_mem_init(struct drm_device *dev)
> return ret;
> }
>
> - dev_priv->fb_mtrr = drm_mtrr_add(drm_get_resource_start(dev, 1),
> - drm_get_resource_len(dev, 1),
> + dev_priv->fb_mtrr = drm_mtrr_add(pci_resource_start(dev->pdev, 1),
> + pci_resource_len(dev->pdev, 1),
> DRM_MTRR_WC);
>
> return 0;
> diff --git a/drivers/gpu/drm/nouveau/nv20_graph.c b/drivers/gpu/drm/nouveau/nv20_graph.c
> index d6fc0a8..fe2349b 100644
> --- a/drivers/gpu/drm/nouveau/nv20_graph.c
> +++ b/drivers/gpu/drm/nouveau/nv20_graph.c
> @@ -616,7 +616,7 @@ nv20_graph_init(struct drm_device *dev)
> nv_wr32(dev, NV10_PGRAPH_SURFACE, tmp);
>
> /* begin RAM config */
> - vramsz = drm_get_resource_len(dev, 0) - 1;
> + vramsz = pci_resource_len(dev->pdev, 0) - 1;
> nv_wr32(dev, 0x4009A4, nv_rd32(dev, NV04_PFB_CFG0));
> nv_wr32(dev, 0x4009A8, nv_rd32(dev, NV04_PFB_CFG1));
> nv_wr32(dev, NV10_PGRAPH_RDI_INDEX, 0x00EA0000);
> @@ -717,7 +717,7 @@ nv30_graph_init(struct drm_device *dev)
> nv_wr32(dev, 0x0040075c , 0x00000001);
>
> /* begin RAM config */
> - /* vramsz = drm_get_resource_len(dev, 0) - 1; */
> + /* vramsz = pci_resource_len(dev->pdev, 0) - 1; */
> nv_wr32(dev, 0x4009A4, nv_rd32(dev, NV04_PFB_CFG0));
> nv_wr32(dev, 0x4009A8, nv_rd32(dev, NV04_PFB_CFG1));
> if (dev_priv->chipset != 0x34) {
> diff --git a/drivers/gpu/drm/nouveau/nv40_graph.c b/drivers/gpu/drm/nouveau/nv40_graph.c
> index 704a25d..65b13b5 100644
> --- a/drivers/gpu/drm/nouveau/nv40_graph.c
> +++ b/drivers/gpu/drm/nouveau/nv40_graph.c
> @@ -367,7 +367,7 @@ nv40_graph_init(struct drm_device *dev)
> nv40_graph_set_region_tiling(dev, i, 0, 0, 0);
>
> /* begin RAM config */
> - vramsz = drm_get_resource_len(dev, 0) - 1;
> + vramsz = pci_resource_len(dev->pdev, 0) - 1;
> switch (dev_priv->chipset) {
> case 0x40:
> nv_wr32(dev, 0x4009A4, nv_rd32(dev, NV04_PFB_CFG0));
> diff --git a/drivers/gpu/drm/nouveau/nv50_instmem.c b/drivers/gpu/drm/nouveau/nv50_instmem.c
> index 5f21df3..ba4809e 100644
> --- a/drivers/gpu/drm/nouveau/nv50_instmem.c
> +++ b/drivers/gpu/drm/nouveau/nv50_instmem.c
> @@ -241,7 +241,8 @@ nv50_instmem_init(struct drm_device *dev)
> return ret;
> BAR0_WI32(priv->fb_bar->gpuobj, 0x00, 0x7fc00000);
> BAR0_WI32(priv->fb_bar->gpuobj, 0x04, 0x40000000 +
> - drm_get_resource_len(dev, 1) - 1);
> + pci_resource_len(dev->pmem,
> + 1) - 1);
> BAR0_WI32(priv->fb_bar->gpuobj, 0x08, 0x40000000);
> BAR0_WI32(priv->fb_bar->gpuobj, 0x0c, 0x00000000);
> BAR0_WI32(priv->fb_bar->gpuobj, 0x10, 0x00000000);
> diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c
> index 1caf625..057192a 100644
> --- a/drivers/gpu/drm/radeon/evergreen.c
> +++ b/drivers/gpu/drm/radeon/evergreen.c
> @@ -1334,8 +1334,8 @@ int evergreen_mc_init(struct radeon_device *rdev)
> }
> rdev->mc.vram_width = numchan * chansize;
> /* Could aper size report 0 ? */
> - rdev->mc.aper_base = drm_get_resource_start(rdev->ddev, 0);
> - rdev->mc.aper_size = drm_get_resource_len(rdev->ddev, 0);
> + rdev->mc.aper_base = pci_resource_start(rdev->pdev, 0);
> + rdev->mc.aper_size = pci_resource_len(rdev->pdev, 0);
> /* Setup GPU memory space */
> /* size in MB on evergreen */
> rdev->mc.mc_vram_size = RREG32(CONFIG_MEMSIZE) * 1024 * 1024;
> diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
> index a89a15a..da674e9 100644
> --- a/drivers/gpu/drm/radeon/r100.c
> +++ b/drivers/gpu/drm/radeon/r100.c
> @@ -2295,8 +2295,8 @@ void r100_vram_init_sizes(struct radeon_device *rdev)
> u64 config_aper_size;
>
> /* work out accessible VRAM */
> - rdev->mc.aper_base = drm_get_resource_start(rdev->ddev, 0);
> - rdev->mc.aper_size = drm_get_resource_len(rdev->ddev, 0);
> + rdev->mc.aper_base = pci_resource_start(rdev->pdev, 0);
> + rdev->mc.aper_size = pci_resource_len(rdev->pdev, 0);
> rdev->mc.visible_vram_size = r100_get_accessible_vram(rdev);
> /* FIXME we don't use the second aperture yet when we could use it */
> if (rdev->mc.visible_vram_size > rdev->mc.aper_size)
> diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
> index e100f69..55675b7 100644
> --- a/drivers/gpu/drm/radeon/r600.c
> +++ b/drivers/gpu/drm/radeon/r600.c
> @@ -1217,8 +1217,8 @@ int r600_mc_init(struct radeon_device *rdev)
> }
> rdev->mc.vram_width = numchan * chansize;
> /* Could aper size report 0 ? */
> - rdev->mc.aper_base = drm_get_resource_start(rdev->ddev, 0);
> - rdev->mc.aper_size = drm_get_resource_len(rdev->ddev, 0);
> + rdev->mc.aper_base = pci_resource_start(rdev->pdev, 0);
> + rdev->mc.aper_size = pci_resource_len(rdev->pdev, 0);
> /* Setup GPU memory space */
> rdev->mc.mc_vram_size = RREG32(CONFIG_MEMSIZE);
> rdev->mc.real_vram_size = RREG32(CONFIG_MEMSIZE);
> diff --git a/drivers/gpu/drm/radeon/radeon_bios.c b/drivers/gpu/drm/radeon/radeon_bios.c
> index 2c92137..654787e 100644
> --- a/drivers/gpu/drm/radeon/radeon_bios.c
> +++ b/drivers/gpu/drm/radeon/radeon_bios.c
> @@ -53,7 +53,7 @@ static bool igp_read_bios_from_vram(struct radeon_device *rdev)
> return false;
>
> rdev->bios = NULL;
> - vram_base = drm_get_resource_start(rdev->ddev, 0);
> + vram_base = pci_resource_start(rdev->pdev, 0);
> bios = ioremap(vram_base, size);
> if (!bios) {
> return false;
> diff --git a/drivers/gpu/drm/radeon/radeon_cp.c b/drivers/gpu/drm/radeon/radeon_cp.c
> index 2f042a3..eb6b9ee 100644
> --- a/drivers/gpu/drm/radeon/radeon_cp.c
> +++ b/drivers/gpu/drm/radeon/radeon_cp.c
> @@ -2120,8 +2120,8 @@ int radeon_driver_load(struct drm_device *dev, unsigned long flags)
> else
> dev_priv->flags |= RADEON_IS_PCI;
>
> - ret = drm_addmap(dev, drm_get_resource_start(dev, 2),
> - drm_get_resource_len(dev, 2), _DRM_REGISTERS,
> + ret = drm_addmap(dev, pci_resource_start(dev->pdev, 2),
> + pci_resource_len(dev->pdev, 2), _DRM_REGISTERS,
> _DRM_READ_ONLY | _DRM_DRIVER, &dev_priv->mmio);
> if (ret != 0)
> return ret;
> @@ -2194,9 +2194,9 @@ int radeon_driver_firstopen(struct drm_device *dev)
>
> dev_priv->gart_info.table_size = RADEON_PCIGART_TABLE_SIZE;
>
> - dev_priv->fb_aper_offset = drm_get_resource_start(dev, 0);
> + dev_priv->fb_aper_offset = pci_resource_start(dev->pdev, 0);
> ret = drm_addmap(dev, dev_priv->fb_aper_offset,
> - drm_get_resource_len(dev, 0), _DRM_FRAME_BUFFER,
> + pci_resource_len(dev->pdev, 0), _DRM_FRAME_BUFFER,
> _DRM_WRITE_COMBINING, &map);
> if (ret != 0)
> return ret;
> diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
> index dd279da..004a6d1 100644
> --- a/drivers/gpu/drm/radeon/radeon_device.c
> +++ b/drivers/gpu/drm/radeon/radeon_device.c
> @@ -650,8 +650,8 @@ int radeon_device_init(struct radeon_device *rdev,
>
> /* Registers mapping */
> /* TODO: block userspace mapping of io register */
> - rdev->rmmio_base = drm_get_resource_start(rdev->ddev, 2);
> - rdev->rmmio_size = drm_get_resource_len(rdev->ddev, 2);
> + rdev->rmmio_base = pci_resource_start(rdev->pdev, 2);
> + rdev->rmmio_size = pci_resource_len(rdev->pdev, 2);
> rdev->rmmio = ioremap(rdev->rmmio_base, rdev->rmmio_size);
> if (rdev->rmmio == NULL) {
> return -ENOMEM;
> diff --git a/drivers/gpu/drm/radeon/rs600.c b/drivers/gpu/drm/radeon/rs600.c
> index 6dc15ea..ba09c87 100644
> --- a/drivers/gpu/drm/radeon/rs600.c
> +++ b/drivers/gpu/drm/radeon/rs600.c
> @@ -686,8 +686,8 @@ void rs600_mc_init(struct radeon_device *rdev)
> {
> u64 base;
>
> - rdev->mc.aper_base = drm_get_resource_start(rdev->ddev, 0);
> - rdev->mc.aper_size = drm_get_resource_len(rdev->ddev, 0);
> + rdev->mc.aper_base = pci_resource_start(rdev->pdev, 0);
> + rdev->mc.aper_size = pci_resource_len(rdev->pdev, 0);
> rdev->mc.vram_is_ddr = true;
> rdev->mc.vram_width = 128;
> rdev->mc.real_vram_size = RREG32(RADEON_CONFIG_MEMSIZE);
> diff --git a/drivers/gpu/drm/radeon/rs690.c b/drivers/gpu/drm/radeon/rs690.c
> index ce4ecbe..de6bcb8 100644
> --- a/drivers/gpu/drm/radeon/rs690.c
> +++ b/drivers/gpu/drm/radeon/rs690.c
> @@ -154,8 +154,8 @@ void rs690_mc_init(struct radeon_device *rdev)
> rdev->mc.vram_width = 128;
> rdev->mc.real_vram_size = RREG32(RADEON_CONFIG_MEMSIZE);
> rdev->mc.mc_vram_size = rdev->mc.real_vram_size;
> - rdev->mc.aper_base = drm_get_resource_start(rdev->ddev, 0);
> - rdev->mc.aper_size = drm_get_resource_len(rdev->ddev, 0);
> + rdev->mc.aper_base = pci_resource_start(rdev->pdev, 0);
> + rdev->mc.aper_size = pci_resource_len(rdev->pdev, 0);
> rdev->mc.visible_vram_size = rdev->mc.aper_size;
> base = RREG32_MC(R_000100_MCCFG_FB_LOCATION);
> base = G_000100_MC_FB_START(base) << 16;
> diff --git a/drivers/gpu/drm/radeon/rv770.c b/drivers/gpu/drm/radeon/rv770.c
> index b7fd820..6a7bf10 100644
> --- a/drivers/gpu/drm/radeon/rv770.c
> +++ b/drivers/gpu/drm/radeon/rv770.c
> @@ -919,8 +919,8 @@ int rv770_mc_init(struct radeon_device *rdev)
> }
> rdev->mc.vram_width = numchan * chansize;
> /* Could aper size report 0 ? */
> - rdev->mc.aper_base = drm_get_resource_start(rdev->ddev, 0);
> - rdev->mc.aper_size = drm_get_resource_len(rdev->ddev, 0);
> + rdev->mc.aper_base = pci_resource_start(rdev->pdev, 0);
> + rdev->mc.aper_size = pci_resource_len(rdev->pdev, 0);
> /* Setup GPU memory space */
> rdev->mc.mc_vram_size = RREG32(CONFIG_MEMSIZE);
> rdev->mc.real_vram_size = RREG32(CONFIG_MEMSIZE);
> diff --git a/drivers/gpu/drm/savage/savage_bci.c b/drivers/gpu/drm/savage/savage_bci.c
> index 2d0c9ca..f576232 100644
> --- a/drivers/gpu/drm/savage/savage_bci.c
> +++ b/drivers/gpu/drm/savage/savage_bci.c
> @@ -573,13 +573,13 @@ int savage_driver_firstopen(struct drm_device *dev)
> dev_priv->mtrr[2].handle = -1;
> if (S3_SAVAGE3D_SERIES(dev_priv->chipset)) {
> fb_rsrc = 0;
> - fb_base = drm_get_resource_start(dev, 0);
> + fb_base = pci_resource_start(dev->pdev, 0);
> fb_size = SAVAGE_FB_SIZE_S3;
> mmio_base = fb_base + SAVAGE_FB_SIZE_S3;
> aper_rsrc = 0;
> aperture_base = fb_base + SAVAGE_APERTURE_OFFSET;
> /* this should always be true */
> - if (drm_get_resource_len(dev, 0) == 0x08000000) {
> + if (pci_resource_len(dev->pdev, 0) == 0x08000000) {
> /* Don't make MMIO write-cobining! We need 3
> * MTRRs. */
> dev_priv->mtrr[0].base = fb_base;
> @@ -599,18 +599,19 @@ int savage_driver_firstopen(struct drm_device *dev)
> dev_priv->mtrr[2].size, DRM_MTRR_WC);
> } else {
> DRM_ERROR("strange pci_resource_len %08llx\n",
> - (unsigned long long)drm_get_resource_len(dev, 0));
> + (unsigned long long)
> + pci_resource_len(dev->pdev, 0));
> }
> } else if (dev_priv->chipset != S3_SUPERSAVAGE &&
> dev_priv->chipset != S3_SAVAGE2000) {
> - mmio_base = drm_get_resource_start(dev, 0);
> + mmio_base = pci_resource_start(dev->pdev, 0);
> fb_rsrc = 1;
> - fb_base = drm_get_resource_start(dev, 1);
> + fb_base = pci_resource_start(dev->pdev, 1);
> fb_size = SAVAGE_FB_SIZE_S4;
> aper_rsrc = 1;
> aperture_base = fb_base + SAVAGE_APERTURE_OFFSET;
> /* this should always be true */
> - if (drm_get_resource_len(dev, 1) == 0x08000000) {
> + if (pci_resource_len(dev->pdev, 1) == 0x08000000) {
> /* Can use one MTRR to cover both fb and
> * aperture. */
> dev_priv->mtrr[0].base = fb_base;
> @@ -620,15 +621,16 @@ int savage_driver_firstopen(struct drm_device *dev)
> dev_priv->mtrr[0].size, DRM_MTRR_WC);
> } else {
> DRM_ERROR("strange pci_resource_len %08llx\n",
> - (unsigned long long)drm_get_resource_len(dev, 1));
> + (unsigned long long)
> + pci_resource_len(dev->pdev, 1));
> }
> } else {
> - mmio_base = drm_get_resource_start(dev, 0);
> + mmio_base = pci_resource_start(dev->pdev, 0);
> fb_rsrc = 1;
> - fb_base = drm_get_resource_start(dev, 1);
> - fb_size = drm_get_resource_len(dev, 1);
> + fb_base = pci_resource_start(dev->pdev, 1);
> + fb_size = pci_resource_len(dev->pdev, 1);
> aper_rsrc = 2;
> - aperture_base = drm_get_resource_start(dev, 2);
> + aperture_base = pci_resource_start(dev->pdev, 2);
> /* Automatic MTRR setup will do the right thing. */
> }
>
> diff --git a/include/drm/drmP.h b/include/drm/drmP.h
> index c1b9871..8f7f5cb 100644
> --- a/include/drm/drmP.h
> +++ b/include/drm/drmP.h
> @@ -1273,10 +1273,6 @@ extern int drm_freebufs(struct drm_device *dev, void *data,
> extern int drm_mapbufs(struct drm_device *dev, void *data,
> struct drm_file *file_priv);
> extern int drm_order(unsigned long size);
> -extern resource_size_t drm_get_resource_start(struct drm_device *dev,
> - unsigned int resource);
> -extern resource_size_t drm_get_resource_len(struct drm_device *dev,
> - unsigned int resource);
>
> /* DMA support (drm_dma.h) */
> extern int drm_dma_setup(struct drm_device *dev);
> --
> 1.7.0.1
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@xxxxxxxxxxxxxxxxxxxxx
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
>
Reviewed-by: Matt Turner <mattst88@xxxxxxxxx>
(I think I sent my reviewed-by the last time this patch was sent.)
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/dri-devel
