diff options
| author | Michel Dänzer <michel.daenzer@amd.com> | 2011-08-19 15:24:18 +0000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-08-22 09:55:19 +0100 |
| commit | ba95c45a78d57ac05bf45d81b92a6ec4d299695d (patch) | |
| tree | c2b07088bdf3de2922eaa5bf0439b98c61a68b97 /drivers/gpu/drm | |
| parent | 4fb1a35c0185f8fa3e71b12de62b8752a9a9ed0f (diff) | |
| download | talos-op-linux-ba95c45a78d57ac05bf45d81b92a6ec4d299695d.tar.gz talos-op-linux-ba95c45a78d57ac05bf45d81b92a6ec4d299695d.zip | |
drm/radeon: Make vramlimit parameter actually work.
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_device.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c index a3b011b49465..b51e15725c6e 100644 --- a/drivers/gpu/drm/radeon/radeon_device.c +++ b/drivers/gpu/drm/radeon/radeon_device.c @@ -301,6 +301,8 @@ void radeon_vram_location(struct radeon_device *rdev, struct radeon_mc *mc, u64 mc->mc_vram_size = mc->aper_size; } mc->vram_end = mc->vram_start + mc->mc_vram_size - 1; + if (radeon_vram_limit && radeon_vram_limit < mc->real_vram_size) + mc->real_vram_size = radeon_vram_limit; dev_info(rdev->dev, "VRAM: %lluM 0x%016llX - 0x%016llX (%lluM used)\n", mc->mc_vram_size >> 20, mc->vram_start, mc->vram_end, mc->real_vram_size >> 20); |
