From patchwork Tue Oct 26 19:21:41 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 283302 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 o9QJLxQi024028 for ; Tue, 26 Oct 2010 19:22:19 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id AE9BA9EFE9 for ; Tue, 26 Oct 2010 12:21:58 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qw0-f49.google.com (mail-qw0-f49.google.com [209.85.216.49]) by gabe.freedesktop.org (Postfix) with ESMTP id 921E29E744 for ; Tue, 26 Oct 2010 12:21:50 -0700 (PDT) Received: by qwh6 with SMTP id 6so2940202qwh.36 for ; Tue, 26 Oct 2010 12:21:49 -0700 (PDT) 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=qkgsvGPWmzFaLDccQSZJETGqkd50YZMdw3oqIXgr4SE=; b=Yc4va5O0MTiM3x5i0aklKusxGrWuS43OeqCxkoO1XWk45Z01P1Tz2qISvXNLWXBQ3p N8jV6k9oH+Bb2gTWny7fJziJm4VxPw2/XMjC+X67mRO+lQZEwkouULT1hlpzhZnqZLVu VudbBQhc0tCcwM48e0gsncNO1VslUc+D7fskA= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=L3OZmxijA/4FpfOVtfn/5dtk1UjUfUTXRYxed9zwPllRkcerPeVQUuunqSjigCbNpo BB4bQ9sTZ/JFhoV6U4iho6isQ+bhNBDaY4hPvcGHeEp7ejU7RIIac7quFu3fbA6ex3zC 6gCWTg/lA5LwxK18GBCEQB9j+bYmFEfY04Dzw= Received: by 10.229.80.194 with SMTP id u2mr8192547qck.49.1288120909895; Tue, 26 Oct 2010 12:21:49 -0700 (PDT) Received: from localhost.localdomain (static-74-96-105-7.washdc.fios.verizon.net [74.96.105.7]) by mx.google.com with ESMTPS id l14sm7671672qck.29.2010.10.26.12.21.48 (version=SSLv3 cipher=RC4-MD5); Tue, 26 Oct 2010 12:21:49 -0700 (PDT) From: Alex Deucher To: airlied@gmail.com, dri-devel@lists.freedesktop.org Subject: [PATCH] drm/radeon/kms: fix r6xx/7xx 1D tiling CS checker Date: Tue, 26 Oct 2010 15:21:41 -0400 Message-Id: <1288120901-6433-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, 26 Oct 2010 19:22:19 +0000 (UTC) diff --git a/drivers/gpu/drm/radeon/r600_cs.c b/drivers/gpu/drm/radeon/r600_cs.c index 7e44b5a..aec0944 100644 --- a/drivers/gpu/drm/radeon/r600_cs.c +++ b/drivers/gpu/drm/radeon/r600_cs.c @@ -190,6 +190,8 @@ static inline int r600_cs_track_validate_cb(struct radeon_cs_parser *p, int i) height = slice_tile_max / (pitch * 8); if (height > 8192) height = 8192; + if (height > 7) + height &= ~0x7; array_mode = G_0280A0_ARRAY_MODE(track->cb_color_info[i]); switch (array_mode) { case V_0280A0_ARRAY_LINEAR_GENERAL: