From patchwork Wed Feb 2 17:37:41 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 527321 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 p12K42U2005314 for ; Wed, 2 Feb 2011 20:04:24 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B414A9E7E4 for ; Wed, 2 Feb 2011 09:38:52 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qy0-f170.google.com (mail-qy0-f170.google.com [209.85.216.170]) by gabe.freedesktop.org (Postfix) with ESMTP id 7D1969E799 for ; Wed, 2 Feb 2011 09:37:55 -0800 (PST) Received: by qyk10 with SMTP id 10so6719988qyk.15 for ; Wed, 02 Feb 2011 09:37:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=7Hpl7nkZ78GPevvllABHlQG7GmlrvVTE70W4VMjAC/0=; b=s1LfXrpNOqxijvu3RIB4+8fNeWyRhC6NwcJYG/Sy5hBlBlCxahyAybEtvkWmlbBaAn Ie+h0UcEI+5zjxIHiFhYQGaCYKk2xTi2svY/g6oxPvPwca/pScACcG2463rWWWVwAGJz FRPa5ZtirAGDBDQJfxP4qWHnHq99O93CD3vjs= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=HI34CuiJXsxjft/NUuHnEXTj8UZ3z5uGb/GHPLeOVV0tIwEsQgli3oo1/ltTu9zaLQ KYV4OPtA39uwoZjq5p3ypOcoVwq23Y3zKSBb4jmvr20wyObmxz2etHZxw47WioZMddeO SNG8sYc/W1+CDaywy/AV+IxoxmNQPxPs/CiPI= Received: by 10.229.86.7 with SMTP id q7mr6584067qcl.262.1296668274831; Wed, 02 Feb 2011 09:37:54 -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 p13sm16625071qcu.29.2011.02.02.09.37.53 (version=SSLv3 cipher=RC4-MD5); Wed, 02 Feb 2011 09:37:54 -0800 (PST) From: Alex Deucher To: airlied@gmail.com, dri-devel@lists.freedesktop.org Subject: [PATCH 2/2] drm/radeon/kms/evergreen: always set certain VGT regs at CP init Date: Wed, 2 Feb 2011 12:37:41 -0500 Message-Id: <1296668261-1902-2-git-send-email-alexdeucher@gmail.com> X-Mailer: git-send-email 1.7.1.1 In-Reply-To: <1296668261-1902-1-git-send-email-alexdeucher@gmail.com> References: <1296668261-1902-1-git-send-email-alexdeucher@gmail.com> Cc: stable@kernel.org 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.6 (demeter1.kernel.org [140.211.167.41]); Wed, 02 Feb 2011 20:04:24 +0000 (UTC) diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c index 8857fb1..d404522 100644 --- a/drivers/gpu/drm/radeon/evergreen.c +++ b/drivers/gpu/drm/radeon/evergreen.c @@ -1248,7 +1248,7 @@ static int evergreen_cp_start(struct radeon_device *rdev) cp_me = 0xff; WREG32(CP_ME_CNTL, cp_me); - r = radeon_ring_lock(rdev, evergreen_default_size + 15); + r = radeon_ring_lock(rdev, evergreen_default_size + 19); if (r) { DRM_ERROR("radeon: cp failed to lock ring (%d).\n", r); return r; @@ -1281,6 +1281,11 @@ static int evergreen_cp_start(struct radeon_device *rdev) radeon_ring_write(rdev, 0xffffffff); radeon_ring_write(rdev, 0xffffffff); + radeon_ring_write(rdev, 0xc0026900); + radeon_ring_write(rdev, 0x00000316); + radeon_ring_write(rdev, 0x0000000e); /* VGT_VERTEX_REUSE_BLOCK_CNTL */ + radeon_ring_write(rdev, 0x00000010); /* */ + radeon_ring_unlock_commit(rdev); return 0;