From patchwork Mon Sep 13 21:04:54 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 175882 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 o8DL5E82026158 for ; Mon, 13 Sep 2010 21:05:34 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9540A9E9D7 for ; Mon, 13 Sep 2010 14:05:13 -0700 (PDT) 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 B14609E80F for ; Mon, 13 Sep 2010 14:05:04 -0700 (PDT) Received: by qyk35 with SMTP id 35so2497827qyk.15 for ; Mon, 13 Sep 2010 14:05:03 -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=sDLqGiSyz7Zzdb3gSe5GAh0rUHDex3Q+a5sazImm39Y=; b=nylgUXLi9DRhHKjoelwXFsL9IDtTZeoLC1kjUvNQlZlpF138AN40/O1uwmqvlWaxPc tgT1upAut+5+hwRKvFOKmzwMOon04Rch3waYeumAAn81gBH/X8VVGH0tZNwBd+AECQUu U4zA+4blsCNUU/FTIX7KJg3VznO3HC1c06GJU= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=ExQHW3XF5KnjyMg0pOf+TN3g+N+PdKZyT/foWOKXlY3t3A0Wdx2BkudES3ET86hHFw LibDfusknboTeS3CxTjxWh/aSirK3X3J3YhPiRhv1u1CAq2DyJ5n3xOepLRam9YFmfY4 fqCXhEyP1hFw4ETRVXP5TycG3oppWqyr+pDBQ= Received: by 10.224.67.82 with SMTP id q18mr106316qai.136.1284411903149; Mon, 13 Sep 2010 14:05:03 -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 r36sm6892938qcs.3.2010.09.13.14.05.01 (version=SSLv3 cipher=RC4-MD5); Mon, 13 Sep 2010 14:05:02 -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 Date: Mon, 13 Sep 2010 17:04:54 -0400 Message-Id: <1284411894-19276-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]); Mon, 13 Sep 2010 21:05:34 +0000 (UTC) diff --git a/drivers/gpu/drm/radeon/r600_cs.c b/drivers/gpu/drm/radeon/r600_cs.c index d886494..27023a3 100644 --- a/drivers/gpu/drm/radeon/r600_cs.c +++ b/drivers/gpu/drm/radeon/r600_cs.c @@ -1172,7 +1172,6 @@ static inline int r600_check_texture_resource(struct radeon_cs_parser *p, u32 i 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; } return 0; }