From patchwork Tue Feb 16 16:35:12 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 79745 Received: from lists.sourceforge.net (lists.sourceforge.net [216.34.181.88]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o1GGaZ5X000443 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Tue, 16 Feb 2010 16:37:12 GMT Received: from localhost ([127.0.0.1] helo=sfs-ml-4.v29.ch3.sourceforge.com) by sfs-ml-4.v29.ch3.sourceforge.com with esmtp (Exim 4.69) (envelope-from ) id 1NhQOP-0005Gm-D5; Tue, 16 Feb 2010 16:35:21 +0000 Received: from sfi-mx-1.v28.ch3.sourceforge.com ([172.29.28.121] helo=mx.sourceforge.net) by sfs-ml-4.v29.ch3.sourceforge.com with esmtp (Exim 4.69) (envelope-from ) id 1NhQOO-0005Gf-3M for dri-devel@lists.sourceforge.net; Tue, 16 Feb 2010 16:35:20 +0000 Received-SPF: pass (sfi-mx-1.v28.ch3.sourceforge.com: domain of gmail.com designates 209.85.220.216 as permitted sender) client-ip=209.85.220.216; envelope-from=alexdeucher@gmail.com; helo=mail-fx0-f216.google.com; Received: from mail-fx0-f216.google.com ([209.85.220.216]) by sfi-mx-1.v28.ch3.sourceforge.com with esmtp (Exim 4.69) id 1NhQON-0005A5-0z for dri-devel@lists.sourceforge.net; Tue, 16 Feb 2010 16:35:20 +0000 Received: by fxm8 with SMTP id 8so6405144fxm.6 for ; Tue, 16 Feb 2010 08:35:12 -0800 (PST) MIME-Version: 1.0 Received: by 10.223.27.70 with SMTP id h6mr4882800fac.50.1266338112549; Tue, 16 Feb 2010 08:35:12 -0800 (PST) Date: Tue, 16 Feb 2010 11:35:12 -0500 Message-ID: Subject: [PATCH] drm/radeon/r600: fix warnings in CS checker From: Alex Deucher To: Dave Airlie , Jerome Glisse , DRI Development Mailing List X-Spam-Score: -1.4 (-) X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -1.5 SPF_CHECK_PASS SPF reports sender host as permitted sender for sender-domain -0.0 SPF_PASS SPF: sender matches SPF record -0.0 DKIM_VERIFIED Domain Keys Identified Mail: signature passes verification 0.0 DKIM_SIGNED Domain Keys Identified Mail: message has a signature 0.1 AWL AWL: From: address is in the auto white-list X-Headers-End: 1NhQON-0005A5-0z X-BeenThere: dri-devel@lists.sourceforge.net X-Mailman-Version: 2.1.9 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.sourceforge.net X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Tue, 16 Feb 2010 16:37:12 +0000 (UTC) diff --git a/drivers/gpu/drm/radeon/r600_cs.c b/drivers/gpu/drm/radeon/r600_cs.c index 00e69c5..cd2c63b 100644 --- a/drivers/gpu/drm/radeon/r600_cs.c +++ b/drivers/gpu/drm/radeon/r600_cs.c @@ -163,7 +163,7 @@ static void r600_cs_track_init(struct r600_cs_track *track) static inline int r600_cs_track_validate_cb(struct radeon_cs_parser *p, int i) { struct r600_cs_track *track = p->track; - u32 bpe, pitch, slice_tile_max, size, tmp, height; + u32 bpe = 0, pitch, slice_tile_max, size, tmp, height; volatile u32 *ib = p->ib->ptr; if (G_0280A0_TILE_MODE(track->cb_color_info[i])) { @@ -935,7 +935,7 @@ static inline int r600_check_texture_resource(struct radeon_cs_parser *p, u32 i struct radeon_bo *texture, struct radeon_bo *mipmap) { - u32 nfaces, nlevels, blevel, w0, h0, d0, bpe; + u32 nfaces, nlevels, blevel, w0, h0, d0, bpe = 0; u32 word0, word1, l0_size, mipmap_size;