diff options
| author | Jordan Crouse <jcrouse@codeaurora.org> | 2010-05-27 15:40:24 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-05-31 20:07:24 -0400 |
| commit | 01d73a6967f12fe6c4bbde1834a9fe662264a2eb (patch) | |
| tree | 32e4a3171cd371dfc037af52e181e6c8454a961b /drivers/gpu/drm/radeon/r100.c | |
| parent | cf22f20ade30f8c03955324aaf27b1049e182600 (diff) | |
drm: Remove drm_resource wrappers
Remove the drm_resource wrappers and directly use the
actual PCI and/or platform functions in their place.
[airlied: fixup nouveau properly to build]
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/r100.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/r100.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c index cc004b05d63e..c485c2cec4da 100644 --- a/drivers/gpu/drm/radeon/r100.c +++ b/drivers/gpu/drm/radeon/r100.c | |||
| @@ -2284,8 +2284,8 @@ void r100_vram_init_sizes(struct radeon_device *rdev) | |||
| 2284 | u64 config_aper_size; | 2284 | u64 config_aper_size; |
| 2285 | 2285 | ||
| 2286 | /* work out accessible VRAM */ | 2286 | /* work out accessible VRAM */ |
| 2287 | rdev->mc.aper_base = drm_get_resource_start(rdev->ddev, 0); | 2287 | rdev->mc.aper_base = pci_resource_start(rdev->pdev, 0); |
| 2288 | rdev->mc.aper_size = drm_get_resource_len(rdev->ddev, 0); | 2288 | rdev->mc.aper_size = pci_resource_len(rdev->pdev, 0); |
| 2289 | rdev->mc.visible_vram_size = r100_get_accessible_vram(rdev); | 2289 | rdev->mc.visible_vram_size = r100_get_accessible_vram(rdev); |
| 2290 | /* FIXME we don't use the second aperture yet when we could use it */ | 2290 | /* FIXME we don't use the second aperture yet when we could use it */ |
| 2291 | if (rdev->mc.visible_vram_size > rdev->mc.aper_size) | 2291 | if (rdev->mc.visible_vram_size > rdev->mc.aper_size) |