diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-04-20 14:15:09 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-04-20 14:15:09 +1000 |
| commit | 7547a917fa5f3b2406f52c7dcf7ec9ad3c8532eb (patch) | |
| tree | 59b0d0e9b6c251c4df5799b93395454592004d57 /drivers/gpu/drm/radeon/evergreen.c | |
| parent | a8089e849a32c5b6bfd6c88dbd09c0ea4a779b71 (diff) | |
| parent | 6b8b1786a8c29ce6e32298b93ac8d4a18a2b11c4 (diff) | |
| download | blackbird-op-linux-7547a917fa5f3b2406f52c7dcf7ec9ad3c8532eb.tar.gz blackbird-op-linux-7547a917fa5f3b2406f52c7dcf7ec9ad3c8532eb.zip | |
Merge branch 'drm-ttm-unmappable' into drm-core-next
* drm-ttm-unmappable:
drm/radeon/kms: enable use of unmappable VRAM V2
drm/ttm: remove io_ field from TTM V6
drm/vmwgfx: add support for new TTM fault callback V5
drm/nouveau/kms: add support for new TTM fault callback V5
drm/radeon/kms: add support for new fault callback V7
drm/ttm: ttm_fault callback to allow driver to handle bo placement V6
drm/ttm: split no_wait argument in 2 GPU or reserve wait
Conflicts:
drivers/gpu/drm/nouveau/nouveau_bo.c
Diffstat (limited to 'drivers/gpu/drm/radeon/evergreen.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/evergreen.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c index 3295154e5934..b3d168fb89e5 100644 --- a/drivers/gpu/drm/radeon/evergreen.c +++ b/drivers/gpu/drm/radeon/evergreen.c @@ -1266,11 +1266,6 @@ int evergreen_mc_init(struct radeon_device *rdev) rdev->mc.mc_vram_size = RREG32(CONFIG_MEMSIZE) * 1024 * 1024; rdev->mc.real_vram_size = RREG32(CONFIG_MEMSIZE) * 1024 * 1024; rdev->mc.visible_vram_size = rdev->mc.aper_size; - /* FIXME remove this once we support unmappable VRAM */ - if (rdev->mc.mc_vram_size > rdev->mc.aper_size) { - rdev->mc.mc_vram_size = rdev->mc.aper_size; - rdev->mc.real_vram_size = rdev->mc.aper_size; - } r600_vram_gtt_location(rdev, &rdev->mc); radeon_update_bandwidth_info(rdev); |
