diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2010-10-25 19:44:00 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-10-26 10:26:41 +1000 |
| commit | b7d8cce5b558e0c0aa6898c9865356481598b46d (patch) | |
| tree | 07f0f80e625e4a60d3f8c3fba89f97ac01c75923 /drivers | |
| parent | f9d9c36204243d81e9d4dd28e58ee335257847d2 (diff) | |
| download | kernel_samsung_smdk4412-b7d8cce5b558e0c0aa6898c9865356481598b46d.zip kernel_samsung_smdk4412-b7d8cce5b558e0c0aa6898c9865356481598b46d.tar.gz kernel_samsung_smdk4412-b7d8cce5b558e0c0aa6898c9865356481598b46d.tar.bz2 | |
drm/radeon/kms: MC vram map needs to be >= pci aperture size
The vram map in the radeon memory controller needs to be
>= the pci aperture size. Fixes:
https://bugs.freedesktop.org/show_bug.cgi?id=28402
The problematic cards in the above bug have 64 MB of vram,
but the pci aperture is 128 MB and the MC vram map was only
64 MB. This can lead to hangs.
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Cc: stable@kernel.org
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/radeon/r100.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c index 6112ac9..6d1540c 100644 --- a/drivers/gpu/drm/radeon/r100.c +++ b/drivers/gpu/drm/radeon/r100.c @@ -2270,6 +2270,9 @@ void r100_vram_init_sizes(struct radeon_device *rdev) /* Fix for RN50, M6, M7 with 8/16/32(??) MBs of VRAM - * Novell bug 204882 + along with lots of ubuntu ones */ + if (rdev->mc.aper_size > config_aper_size) + config_aper_size = rdev->mc.aper_size; + if (config_aper_size > rdev->mc.real_vram_size) rdev->mc.mc_vram_size = config_aper_size; else |