diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-07-07 18:37:35 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-07-07 18:37:35 +1000 |
| commit | db8cc27b804f89e8fd5f9d5385161956a777c471 (patch) | |
| tree | 4d84e12dbf9b4bd75fa6150f4aedf54a41d722db /drivers/gpu/drm/radeon/rs600.c | |
| parent | 6dbe7465713f0e45f0e867105ca944978d57346e (diff) | |
| parent | 05269a3a5a78bb074413de495105d7a2686c4529 (diff) | |
| download | linux-db8cc27b804f89e8fd5f9d5385161956a777c471.tar.gz | |
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/rs600.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/rs600.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/rs600.c b/drivers/gpu/drm/radeon/rs600.c index 7bb4c3e52f3b..5ce3ccc7a423 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); |