From patchwork Tue Sep 14 14:10:47 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 179272 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 o8EEBDdO002061 for ; Tue, 14 Sep 2010 14:11:34 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 877C09EB4F for ; Tue, 14 Sep 2010 07:11:13 -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 65D449E7C0 for ; Tue, 14 Sep 2010 07:11:05 -0700 (PDT) Received: by qwd7 with SMTP id 7so237397qwd.36 for ; Tue, 14 Sep 2010 07:11:04 -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:in-reply-to:references; bh=A3R+j+vFAWjaBo3IeWQmC9vd1x1n6GFrYrEBjtlOEp8=; b=AxtbXO8bYVU8CAg9n7LR7GKe2M5ai04sdhBrgBpKBVFqIk5OBo/qPcmGKee9E0z62I JJUQf96KbFDGnwKwkaUsiLpI8oo26fKY9bgPRMNBZw9orOsdX6LvrWYrWE8rfR0XzLM8 LmY5YowyOntXDcC2tSyuMO0chdpGltv6N90wo= 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=lMkqH/l49IIrdRxmU9ZkVVYn3MLthfQJbHfQOnw2OWtTnGC4ZO7x8BUkJBOU3K+Qke S0kr3J0r2+LKJWBygSc/yJlXCZqr4PMBZkq7MdTcZZ321ss5WMHNEBqut4BMBbLgc7Q+ iwbQazVgtbFH+/8TOiL50oMfF7Ivvpxr2k1hU= Received: by 10.224.119.18 with SMTP id x18mr1101371qaq.302.1284473464570; Tue, 14 Sep 2010 07:11:04 -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 f15sm166534qcr.13.2010.09.14.07.11.02 (version=SSLv3 cipher=RC4-MD5); Tue, 14 Sep 2010 07:11:03 -0700 (PDT) From: Alex Deucher To: airlied@gmail.com, dri-devel@lists.freedesktop.org Subject: [PATCH] drm/radeon/kms: only warn on mipmap size checks in r600 cs checker (v2) Date: Tue, 14 Sep 2010 10:10:47 -0400 Message-Id: <1284473447-20575-1-git-send-email-alexdeucher@gmail.com> X-Mailer: git-send-email 1.7.1.1 In-Reply-To: <1284411894-19276-1-git-send-email-alexdeucher@gmail.com> References: <1284411894-19276-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.3 (demeter1.kernel.org [140.211.167.41]); Tue, 14 Sep 2010 14:11:34 +0000 (UTC) diff --git a/drivers/gpu/drm/radeon/r600_cs.c b/drivers/gpu/drm/radeon/r600_cs.c index d886494..250a3a9 100644 --- a/drivers/gpu/drm/radeon/r600_cs.c +++ b/drivers/gpu/drm/radeon/r600_cs.c @@ -1170,9 +1170,8 @@ static inline int r600_check_texture_resource(struct radeon_cs_parser *p, u32 i /* using get ib will give us the offset into the mipmap bo */ word0 = radeon_get_ib_value(p, idx + 3) << 8; if ((mipmap_size + word0) > radeon_bo_size(mipmap)) { - dev_warn(p->dev, "mipmap bo too small (%d %d %d %d %d %d -> %d have %ld)\n", - w0, h0, bpe, blevel, nlevels, word0, mipmap_size, radeon_bo_size(texture)); - return -EINVAL; + /*dev_warn(p->dev, "mipmap bo too small (%d %d %d %d %d %d -> %d have %ld)\n", + w0, h0, bpe, blevel, nlevels, word0, mipmap_size, radeon_bo_size(texture));*/ } return 0; }