From patchwork Thu Nov 25 03:26:55 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 355922 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 oAP3RJSF004746 for ; Thu, 25 Nov 2010 03:27:45 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 130409EEFA for ; Wed, 24 Nov 2010 19:27:19 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-vw0-f49.google.com (mail-vw0-f49.google.com [209.85.212.49]) by gabe.freedesktop.org (Postfix) with ESMTP id 7B79F9E790 for ; Wed, 24 Nov 2010 19:27:07 -0800 (PST) Received: by vws5 with SMTP id 5so282706vws.36 for ; Wed, 24 Nov 2010 19:27:06 -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:in-reply-to:references; bh=T9mWa9NkkgTeKswMFEY7pOtmZ8yEmhV524YvGT4y6ko=; b=s6JQyaYl96EhEvPH7DZjLM7Io+pkS2bX/u/Cz3hCCk8ApQ+8KtAWXMOHqou2famod6 TSPUFig0jsVfWqLWnUHX9oIcqlXtczukIITVYyHzPafLTvjtqdrhRN3RZ0eagI0C4yko Si6WchVsy0vO7LDdhcS2O1qchIJgW9zvFVy+k= 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=AgYhl9UcVuFaNh/ZlOvTdDBEEg38+NRT8tNf6ShMuYHAka33B/QU2FujP0SOP5Xl7q nSVo5ChdOdeKhBwGpHl6Rul2Zs3dUAYEuB8Ai3pEBSomzWRmEeIg3XRpOL2Fxr2bu/wT In/+IRaELAJK0YfuJ1NaWlr+WjyY3ehy2UHmk= Received: by 10.220.189.9 with SMTP id dc9mr74967vcb.9.1290655626394; Wed, 24 Nov 2010 19:27:06 -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 b26sm93482vby.3.2010.11.24.19.27.04 (version=SSLv3 cipher=RC4-MD5); Wed, 24 Nov 2010 19:27:05 -0800 (PST) From: Alex Deucher To: airlied@gmail.com, dri-devel@lists.freedesktop.org Subject: [PATCH] Revert "drm/radeon/kms: fix typo in r600 cs checker" Date: Wed, 24 Nov 2010 22:26:55 -0500 Message-Id: <1290655615-9286-1-git-send-email-alexdeucher@gmail.com> X-Mailer: git-send-email 1.7.1.1 In-Reply-To: <201011242145.37041.rjw@sisk.pl> References: <201011242145.37041.rjw@sisk.pl> Cc: "Rafael J. Wysocki" 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]); Thu, 25 Nov 2010 03:27:45 +0000 (UTC) diff --git a/drivers/gpu/drm/radeon/r600_cs.c b/drivers/gpu/drm/radeon/r600_cs.c index 9bebac1..0f90fc3 100644 --- a/drivers/gpu/drm/radeon/r600_cs.c +++ b/drivers/gpu/drm/radeon/r600_cs.c @@ -315,7 +315,7 @@ static inline int r600_cs_track_validate_cb(struct radeon_cs_parser *p, int i) if (array_mode == V_0280A0_ARRAY_LINEAR_GENERAL) { /* the initial DDX does bad things with the CB size occasionally */ /* it rounds up height too far for slice tile max but the BO is smaller */ - tmp = (height - 7) * pitch * bpe; + tmp = (height - 7) * 8 * bpe; if ((tmp + track->cb_color_bo_offset[i]) > radeon_bo_size(track->cb_color_bo[i])) { dev_warn(p->dev, "%s offset[%d] %d %d %lu too big\n", __func__, i, track->cb_color_bo_offset[i], tmp, radeon_bo_size(track->cb_color_bo[i])); return -EINVAL;