---

yaml --- r: 228619 b: refs/heads/master c: 880981e h: refs/heads/master i: 228617: fa0b72b 228615: b5373da v: v3
git-mirror · Dec 21, 2010 · d3ed3e8 · d3ed3e8
1 parent e714d45
commit d3ed3e8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c324acd5032f516b8188da99d2ce05cf8d1294d6
+refs/heads/master: 880981e49b90568ebb53428e231b43b8c1049ef9
diff --git a/trunk/drivers/gpu/drm/radeon/evergreen.c b/trunk/drivers/gpu/drm/radeon/evergreen.c
@@ -2782,6 +2782,11 @@ static int evergreen_startup(struct radeon_device *rdev)
 		rdev->asic->copy = NULL;
 		dev_warn(rdev->dev, "failed blitter (%d) falling back to memcpy\n", r);
 	}
+	/* XXX: ontario has problems blitting to gart at the moment */
+	if (rdev->family == CHIP_PALM) {
+		rdev->asic->copy = NULL;
+		rdev->mc.active_vram_size = rdev->mc.visible_vram_size;
+	}
 
 	/* allocate wb buffer */
 	r = radeon_wb_init(rdev);