---

yaml --- r: 263192 b: refs/heads/master c: ba95c45 h: refs/heads/master v: v3
git-mirror · Aug 22, 2011 · 4b44008 · 4b44008
1 parent 92f4a99
commit 4b44008
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4fb1a35c0185f8fa3e71b12de62b8752a9a9ed0f
+refs/heads/master: ba95c45a78d57ac05bf45d81b92a6ec4d299695d
diff --git a/trunk/drivers/gpu/drm/radeon/radeon_device.c b/trunk/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);