From patchwork Tue Dec 21 21:16:13 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 425111 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oBLLGUp4024214 for ; Tue, 21 Dec 2010 21:16:50 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6F9CD9ED5F for ; Tue, 21 Dec 2010 13:16:29 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qy0-f177.google.com (mail-qy0-f177.google.com [209.85.216.177]) by gabe.freedesktop.org (Postfix) with ESMTP id 036D39E942 for ; Tue, 21 Dec 2010 13:16:20 -0800 (PST) Received: by qyk27 with SMTP id 27so5196171qyk.15 for ; Tue, 21 Dec 2010 13:16:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer; bh=x7t0O9i08brkKrczHlpdJwhoVrjAUf/bh8bdwZWzqcg=; b=Ab19BX/mzQn7MpC2dGXuiDXcto4p1deKrI/7IgAIgOuAERbysqU5wDX9KMT+bKigBi +yOqdY9YfiLbkzFycK+xyforOKn4mqMWL5eOmBt568uZeDa36gFnuYwjkNdAQMq6Eb4f dFvuXeg0zTTKQRYFGDfR3bJwWf+BudM0OfpGw= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=m1skIDHUB7rkemyHiyShP3mdOh883OSD+2ol4kiGiiPmqseOCquDAVBqHYMKv2SgUW NMa2JFU+qAxdN7V5H6O6E44xNT2lCxRWFCa5liuf6GAXEO2PetjV8qRlwvU63cTDMaNP oxBs0niK3zDFm/eTsAt6S8ciyRFeNLtmAvd8A= Received: by 10.224.20.71 with SMTP id e7mr5587642qab.150.1292966180527; Tue, 21 Dec 2010 13:16:20 -0800 (PST) Received: from localhost.localdomain (static-74-96-105-7.washdc.fios.verizon.net [74.96.105.7]) by mx.google.com with ESMTPS id m14sm3217562qcu.8.2010.12.21.13.16.18 (version=SSLv3 cipher=RC4-MD5); Tue, 21 Dec 2010 13:16:19 -0800 (PST) From: Alex Deucher To: airlied@gmail.com, dri-devel@lists.freedesktop.org Subject: [PATCH] drm/radeon/kms: disable bo moves using the blitter Date: Tue, 21 Dec 2010 16:16:13 -0500 Message-Id: <1292966173-13703-1-git-send-email-alexdeucher@gmail.com> X-Mailer: git-send-email 1.7.1.1 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Tue, 21 Dec 2010 21:16:50 +0000 (UTC) diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c index 01d292c..868bf53 100644 --- a/drivers/gpu/drm/radeon/evergreen.c +++ b/drivers/gpu/drm/radeon/evergreen.c @@ -2890,6 +2890,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);