From patchwork Thu Mar 3 01:07:39 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 604701 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 p231G1gx026139 for ; Thu, 3 Mar 2011 01:16:22 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A34F09ECE7 for ; Wed, 2 Mar 2011 17:16:00 -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 6A3419E94F for ; Wed, 2 Mar 2011 17:08:14 -0800 (PST) Received: by mail-qy0-f170.google.com with SMTP id 32so4835525qyk.15 for ; Wed, 02 Mar 2011 17:08:14 -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=kCiGFPJEGLzCq6tUQXxbX1Ua2Ave/ZDRZ2G9vCemudY=; b=NZc/6+dHLzxC0zi0uTEUIAljAHOR7ulb72H/5Odk7SFOdUNh61Fco1qxvdXG4ziCEk AgisYQLKUFxkl/mVHJTqmf6zuPWVQhiZs+mUhO1LOxXKRjE7v74VjHCO4HfcXth/rUlm Y0easCmp3tcP2xBek4ZKzZJa2MMcGq+XNfqJc= 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=HPUbynosKRE6UYSAzWeyeuG0K+TyCD0y31v/4sgN8R/zODt4MtcPX4f5dd5z3/W+r5 /FTrCJqgLkpFgQ4QiLqFOiFJzJ7QUjtMwY2rH6IamChIKxeLm+UxxZAXL+S+TW+o3oeS dadEavVdGr0Y2cXAHkNIXsbyZqVhAKdNBAhBg= Received: by 10.229.253.204 with SMTP id nb12mr414115qcb.277.1299114494164; Wed, 02 Mar 2011 17:08:14 -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 p13sm409704qcu.29.2011.03.02.17.08.12 (version=SSLv3 cipher=OTHER); Wed, 02 Mar 2011 17:08:13 -0800 (PST) From: Alex Deucher To: airlied@gmail.com, dri-devel@lists.freedesktop.org Subject: [PATCH 13/15] drm/radeon/kms/cayman: always set certain VGT regs at CP init Date: Wed, 2 Mar 2011 20:07:39 -0500 Message-Id: <1299114461-4289-13-git-send-email-alexdeucher@gmail.com> X-Mailer: git-send-email 1.7.1.1 In-Reply-To: <1299114461-4289-1-git-send-email-alexdeucher@gmail.com> References: <1299114461-4289-1-git-send-email-alexdeucher@gmail.com> 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]); Thu, 03 Mar 2011 01:16:22 +0000 (UTC) diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c index 227173b..8c199c4 100644 --- a/drivers/gpu/drm/radeon/ni.c +++ b/drivers/gpu/drm/radeon/ni.c @@ -1092,7 +1092,7 @@ static int cayman_cp_start(struct radeon_device *rdev) cayman_cp_enable(rdev, true); - r = radeon_ring_lock(rdev, cayman_default_size + 15); + r = radeon_ring_lock(rdev, cayman_default_size + 19); if (r) { DRM_ERROR("radeon: cp failed to lock ring (%d).\n", r); return r; @@ -1125,6 +1125,11 @@ static int cayman_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); /* XXX init other rings */