From patchwork Thu Feb 18 18:31:09 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 80392 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 o1IIWTP0011966 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Thu, 18 Feb 2010 18:33:07 GMT Received: from localhost ([127.0.0.1] helo=sfs-ml-3.v29.ch3.sourceforge.com) by sfs-ml-3.v29.ch3.sourceforge.com with esmtp (Exim 4.69) (envelope-from ) id 1NiB9h-0002sq-R9; Thu, 18 Feb 2010 18:31:17 +0000 Received: from sfi-mx-4.v28.ch3.sourceforge.com ([172.29.28.124] helo=mx.sourceforge.net) by sfs-ml-3.v29.ch3.sourceforge.com with esmtp (Exim 4.69) (envelope-from ) id 1NiB9g-0002sj-Vv for dri-devel@lists.sourceforge.net; Thu, 18 Feb 2010 18:31:16 +0000 Received-SPF: pass (sfi-mx-4.v28.ch3.sourceforge.com: domain of gmail.com designates 209.85.220.223 as permitted sender) client-ip=209.85.220.223; envelope-from=alexdeucher@gmail.com; helo=mail-fx0-f223.google.com; Received: from mail-fx0-f223.google.com ([209.85.220.223]) by sfi-mx-4.v28.ch3.sourceforge.com with esmtp (Exim 4.69) id 1NiB9g-0007mu-0n for dri-devel@lists.sourceforge.net; Thu, 18 Feb 2010 18:31:16 +0000 Received: by fxm23 with SMTP id 23so388411fxm.2 for ; Thu, 18 Feb 2010 10:31:10 -0800 (PST) MIME-Version: 1.0 Received: by 10.223.4.132 with SMTP id 4mr8766488far.90.1266517869956; Thu, 18 Feb 2010 10:31:09 -0800 (PST) Date: Thu, 18 Feb 2010 13:31:09 -0500 Message-ID: Subject: [PATCH] drm/radeon/kms/r7xx: fix spelling in struct From: Alex Deucher To: Dave Airlie , 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: 1NiB9g-0007mu-0n 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]); Thu, 18 Feb 2010 18:33:12 +0000 (UTC) diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h index 9f35bee..814c332 100644 --- a/drivers/gpu/drm/radeon/radeon.h +++ b/drivers/gpu/drm/radeon/radeon.h @@ -831,7 +831,7 @@ struct rv770_asic { unsigned sx_num_of_sets; unsigned sc_prim_fifo_size; unsigned sc_hiz_tile_fifo_size; - unsigned sc_earlyz_tile_fifo_fize; + unsigned sc_earlyz_tile_fifo_size; unsigned tiling_nbanks; unsigned tiling_npipes; unsigned tiling_group_size; diff --git a/drivers/gpu/drm/radeon/rv770.c b/drivers/gpu/drm/radeon/rv770.c index 2c10fae..3fce1e7 100644 --- a/drivers/gpu/drm/radeon/rv770.c +++ b/drivers/gpu/drm/radeon/rv770.c @@ -490,7 +490,7 @@ static void rv770_gpu_init(struct radeon_device *rdev) rdev->config.rv770.sx_num_of_sets = 7; rdev->config.rv770.sc_prim_fifo_size = 0xF9; rdev->config.rv770.sc_hiz_tile_fifo_size = 0x30; - rdev->config.rv770.sc_earlyz_tile_fifo_fize = 0x130; + rdev->config.rv770.sc_earlyz_tile_fifo_size = 0x130; break; case CHIP_RV730: rdev->config.rv770.max_pipes = 2; @@ -510,7 +510,7 @@ static void rv770_gpu_init(struct radeon_device *rdev) rdev->config.rv770.sx_num_of_sets = 7; rdev->config.rv770.sc_prim_fifo_size = 0xf9; rdev->config.rv770.sc_hiz_tile_fifo_size = 0x30; - rdev->config.rv770.sc_earlyz_tile_fifo_fize = 0x130; + rdev->config.rv770.sc_earlyz_tile_fifo_size = 0x130; if (rdev->config.rv770.sx_max_export_pos_size > 16) { rdev->config.rv770.sx_max_export_pos_size -= 16; rdev->config.rv770.sx_max_export_smx_size += 16; @@ -534,7 +534,7 @@ static void rv770_gpu_init(struct radeon_device *rdev) rdev->config.rv770.sx_num_of_sets = 7; rdev->config.rv770.sc_prim_fifo_size = 0x40; rdev->config.rv770.sc_hiz_tile_fifo_size = 0x30; - rdev->config.rv770.sc_earlyz_tile_fifo_fize = 0x130; + rdev->config.rv770.sc_earlyz_tile_fifo_size = 0x130; break; case CHIP_RV740: rdev->config.rv770.max_pipes = 4; @@ -554,7 +554,7 @@ static void rv770_gpu_init(struct radeon_device *rdev) rdev->config.rv770.sx_num_of_sets = 7; rdev->config.rv770.sc_prim_fifo_size = 0x100; rdev->config.rv770.sc_hiz_tile_fifo_size = 0x30; - rdev->config.rv770.sc_earlyz_tile_fifo_fize = 0x130; + rdev->config.rv770.sc_earlyz_tile_fifo_size = 0x130; if (rdev->config.rv770.sx_max_export_pos_size > 16) { rdev->config.rv770.sx_max_export_pos_size -= 16; @@ -712,7 +712,7 @@ static void rv770_gpu_init(struct radeon_device *rdev) WREG32(PA_SC_FIFO_SIZE, (SC_PRIM_FIFO_SIZE(rdev->config.rv770.sc_prim_fifo_size) | SC_HIZ_TILE_FIFO_SIZE(rdev->config.rv770.sc_hiz_tile_fifo_size) | - SC_EARLYZ_TILE_FIFO_SIZE(rdev->config.rv770.sc_earlyz_tile_fifo_fize))); + SC_EARLYZ_TILE_FIFO_SIZE(rdev->config.rv770.sc_earlyz_tile_fifo_size))); WREG32(PA_SC_MULTI_CHIP_CNTL, 0); diff --git a/drivers/gpu/drm/radeon/rv770d.h b/drivers/gpu/drm/radeon/rv770d.h index 9506f8c..2920887 100644 --- a/drivers/gpu/drm/radeon/rv770d.h +++ b/drivers/gpu/drm/radeon/rv770d.h @@ -180,6 +180,7 @@ #define PA_SC_FIFO_SIZE 0x8BCC #define SC_PRIM_FIFO_SIZE(x) ((x) << 0) #define SC_HIZ_TILE_FIFO_SIZE(x) ((x) << 12) +#define SC_EARLYZ_TILE_FIFO_SIZE(x) ((x) << 20) #define PA_SC_FORCE_EOV_MAX_CNTS 0x8B24 #define FORCE_EOV_MAX_CLK_CNT(x) ((x)<<0) #define FORCE_EOV_MAX_REZ_CNT(x) ((x)<<16) @@ -187,7 +188,6 @@ #define PA_SC_LINE_STIPPLE_STATE 0x8B10 #define PA_SC_MODE_CNTL 0x28A4C #define PA_SC_MULTI_CHIP_CNTL 0x8B20 -#define SC_EARLYZ_TILE_FIFO_SIZE(x) ((x) << 20) #define SCRATCH_REG0 0x8500 #define SCRATCH_REG1 0x8504