diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-07-07 10:37:35 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-07-07 10:37:35 +0200 |
| commit | db8cc27b804f89e8fd5f9d5385161956a777c471 (patch) | |
| tree | 4d84e12dbf9b4bd75fa6150f4aedf54a41d722db /drivers/gpu/drm/radeon/evergreen.c | |
| parent | Merge tag 'v2.6.35-rc4' into drm-testing (diff) | |
| parent | drm: Make sure the DRM offset matches the CPU (diff) | |
| download | linux-db8cc27b804f89e8fd5f9d5385161956a777c471.tar.xz linux-db8cc27b804f89e8fd5f9d5385161956a777c471.zip | |
Merge branch 'drm-platform' into drm-testing
* drm-platform:
drm: Make sure the DRM offset matches the CPU
drm: Add __arm defines to DRM
drm: Add support for platform devices to register as DRM devices
drm: Remove drm_resource wrappers
Diffstat (limited to 'drivers/gpu/drm/radeon/evergreen.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/evergreen.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c index 1caf625e472b..057192acdd36 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; |