From patchwork Thu Feb 10 19:51:34 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 547371 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 p1AJqbI9032124 for ; Thu, 10 Feb 2011 19:52:58 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8B0386AF67 for ; Thu, 10 Feb 2011 11:52:37 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-vx0-f177.google.com (mail-vx0-f177.google.com [209.85.220.177]) by gabe.freedesktop.org (Postfix) with ESMTP id D34CF9E7F8 for ; Thu, 10 Feb 2011 11:51:45 -0800 (PST) Received: by mail-vx0-f177.google.com with SMTP id 2so882125vxd.36 for ; Thu, 10 Feb 2011 11:51:45 -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=r7drgxieeUu1nSiBfiR2XqqbeS4oM2gq8K3oiyA4EAg=; b=sAc8Au3AO+ztnFFxzNyi5uF9Cio0DRde1kIZ/XsgxCrMVy0vB2EGeLZ9HNa6O6hgGS +Egkbn6QfmNDyfeCYjsrwbKMdB+VFIRL2QcxbXE4FBGzCr5Kz6tkk7DzSlf+PBA7fQ6C pFX+x88aCmBCBlOzJHEbtaeZKvdoO68lhgFcc= 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=KoczyLUYSI3FZTVXbkXJj6u70aidYQKSSbvQGKxKKS6BcpHMWayLRxVYyHTYwhTBvT NOQ++pMfLEqirXkT7Y0PalZThJMM0uewrik34hjUvxwgxtUqxZgqnk+vyUXCvidUO6iT 0VWbvvXQJy/RYKCWnq3h9Vyj07SvXCcQ6LhgY= Received: by 10.220.70.135 with SMTP id d7mr5789578vcj.32.1297367504347; Thu, 10 Feb 2011 11:51:44 -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 v26sm203500vcr.13.2011.02.10.11.51.42 (version=SSLv3 cipher=OTHER); Thu, 10 Feb 2011 11:51:43 -0800 (PST) From: Alex Deucher To: airlied@gmail.com, dri-devel@lists.freedesktop.org Subject: [PATCH 2/2] drm/radeon/kms: use linear aligned for evergreen/ni bo blits Date: Thu, 10 Feb 2011 14:51:34 -0500 Message-Id: <1297367494-1923-2-git-send-email-alexdeucher@gmail.com> X-Mailer: git-send-email 1.7.1.1 In-Reply-To: <1297367494-1923-1-git-send-email-alexdeucher@gmail.com> References: <1297367494-1923-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, 10 Feb 2011 19:52:58 +0000 (UTC) diff --git a/drivers/gpu/drm/radeon/evergreen_blit_kms.c b/drivers/gpu/drm/radeon/evergreen_blit_kms.c index a1ba4b3..b3f99f4 100644 --- a/drivers/gpu/drm/radeon/evergreen_blit_kms.c +++ b/drivers/gpu/drm/radeon/evergreen_blit_kms.c @@ -55,7 +55,7 @@ set_render_target(struct radeon_device *rdev, int format, if (h < 8) h = 8; - cb_color_info = ((format << 2) | (1 << 24)); + cb_color_info = ((format << 2) | (1 << 24) | (1 << 8)); pitch = (w / 8) - 1; slice = ((w * h) / 64) - 1; @@ -173,7 +173,7 @@ set_tex_resource(struct radeon_device *rdev, sq_tex_resource_word0 = (1 << 0); /* 2D */ sq_tex_resource_word0 |= ((((pitch >> 3) - 1) << 6) | ((w - 1) << 18)); - sq_tex_resource_word1 = ((h - 1) << 0); + sq_tex_resource_word1 = ((h - 1) << 0) | (1 << 28); /* xyzw swizzles */ sq_tex_resource_word4 = (0 << 16) | (1 << 19) | (2 << 22) | (3 << 25);