From d3ed3e8ccde79a8b3df3a486b579bf4ab9b696c6 Mon Sep 17 00:00:00 2001
From: Alex Deucher <alexdeucher@gmail.com>
Date: Tue, 21 Dec 2010 16:16:13 -0500
Subject: [PATCH] --- yaml --- r: 228619 b: refs/heads/master c:
 880981e49b90568ebb53428e231b43b8c1049ef9 h: refs/heads/master i:   228617:
 fa0b72bb8e7eca1eacaeb5633cd975fcede5b9e6   228615:
 b5373dadca510a7ba35f71e9570e6457526952e9 v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/gpu/drm/radeon/evergreen.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 52606e47474c..d1ff4ce12a23 100644
--- 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
index f7d7477daffb..499122c8ccc9 100644
--- 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);