From patchwork Tue Apr 13 22:29:57 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 92280 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o3DMUG8u027553 for ; Tue, 13 Apr 2010 22:30:56 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 581629F315; Tue, 13 Apr 2010 15:30:01 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail.ffwll.ch (cable-static-49-187.intergga.ch [157.161.49.187]) by gabe.freedesktop.org (Postfix) with ESMTP id EB6089F303 for ; Tue, 13 Apr 2010 15:29:56 -0700 (PDT) Received: by mail.ffwll.ch (Postfix, from userid 1000) id 46DCB20C229; Wed, 14 Apr 2010 00:30:16 +0200 (CEST) X-Spam-ASN: X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on orange.ffwll.ch X-Spam-Level: X-Spam-Hammy: 0.000-+--struct, 0.000-+--100644, 0.000-+--signedoffby X-Spam-Status: No, score=-4.5 required=6.0 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.2.5 X-Spam-Spammy: 0.957-+--H*r:mail.ffwll.ch, 0.956-+--H*m:ffwll, 0.950-+--H*Ad:U*daniel.vetter Received: from biene (unknown [192.168.23.129]) by mail.ffwll.ch (Postfix) with ESMTP id B3DE420C22B; Wed, 14 Apr 2010 00:29:33 +0200 (CEST) Received: from daniel by biene with local (Exim 4.71) (envelope-from ) id 1O1ocQ-0001Co-BX; Wed, 14 Apr 2010 00:30:06 +0200 From: Daniel Vetter To: eric@anholt.net Date: Wed, 14 Apr 2010 00:29:57 +0200 Message-Id: <1271197798-4581-8-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1271197798-4581-1-git-send-email-daniel.vetter@ffwll.ch> References: <1271197798-4581-1-git-send-email-daniel.vetter@ffwll.ch> Cc: Daniel Vetter , intel-gfx@lists.freedesktop.org Subject: [Intel-gfx] [PATCH 7/8] agp/intel-gtt: kill intel_i830_tlbflush X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Tue, 13 Apr 2010 22:30:57 +0000 (UTC) diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c index 8890543..3a8f5d7 100644 --- a/drivers/char/agp/intel-gtt.c +++ b/drivers/char/agp/intel-gtt.c @@ -276,11 +276,6 @@ static void intel_i810_cleanup(void) iounmap(intel_private.registers); } -static void intel_i810_tlbflush(struct agp_memory *mem) -{ - return; -} - static void intel_i810_agp_enable(struct agp_bridge_data *bridge, u32 mode) { return; @@ -382,7 +377,6 @@ static int intel_i810_insert_entries(struct agp_memory *mem, off_t pg_start, goto out_err; } - agp_bridge->driver->tlb_flush(mem); out: ret = 0; out_err: @@ -403,7 +397,6 @@ static int intel_i810_remove_entries(struct agp_memory *mem, off_t pg_start, } readl(intel_private.registers+I810_PTE_BASE+((i-1)*4)); - agp_bridge->driver->tlb_flush(mem); return 0; } @@ -948,7 +941,6 @@ static int intel_i830_insert_entries(struct agp_memory *mem, off_t pg_start, intel_private.registers+I810_PTE_BASE+(j*4)); } readl(intel_private.registers+I810_PTE_BASE+((j-1)*4)); - agp_bridge->driver->tlb_flush(mem); out: ret = 0; @@ -976,7 +968,6 @@ static int intel_i830_remove_entries(struct agp_memory *mem, off_t pg_start, } readl(intel_private.registers+I810_PTE_BASE+((i-1)*4)); - agp_bridge->driver->tlb_flush(mem); return 0; } @@ -1176,7 +1167,6 @@ static int intel_i915_insert_entries(struct agp_memory *mem, off_t pg_start, global_cache_flush(); intel_agp_insert_sg_entries(mem, pg_start, mask_type); - agp_bridge->driver->tlb_flush(mem); out: ret = 0; @@ -1204,7 +1194,6 @@ static int intel_i915_remove_entries(struct agp_memory *mem, off_t pg_start, readl(intel_private.gtt+i-1); - agp_bridge->driver->tlb_flush(mem); return 0; } @@ -1396,7 +1385,6 @@ static const struct agp_bridge_driver intel_810_driver = { .configure = intel_i810_configure, .fetch_size = intel_i810_fetch_size, .cleanup = intel_i810_cleanup, - .tlb_flush = intel_i810_tlbflush, .mask_memory = intel_i810_mask_memory, .masks = intel_i810_masks, .agp_enable = intel_i810_agp_enable, @@ -1423,7 +1411,6 @@ static const struct agp_bridge_driver intel_830_driver = { .configure = intel_i830_configure, .fetch_size = intel_i830_fetch_size, .cleanup = intel_i830_cleanup, - .tlb_flush = intel_i810_tlbflush, .mask_memory = intel_i810_mask_memory, .masks = intel_i810_masks, .agp_enable = intel_i810_agp_enable, @@ -1451,7 +1438,6 @@ static const struct agp_bridge_driver intel_915_driver = { .configure = intel_i915_configure, .fetch_size = intel_i9xx_fetch_size, .cleanup = intel_i915_cleanup, - .tlb_flush = intel_i810_tlbflush, .mask_memory = intel_i810_mask_memory, .masks = intel_i810_masks, .agp_enable = intel_i810_agp_enable, @@ -1485,7 +1471,6 @@ static const struct agp_bridge_driver intel_i965_driver = { .configure = intel_i915_configure, .fetch_size = intel_i9xx_fetch_size, .cleanup = intel_i915_cleanup, - .tlb_flush = intel_i810_tlbflush, .mask_memory = intel_i965_mask_memory, .masks = intel_i810_masks, .agp_enable = intel_i810_agp_enable, @@ -1519,7 +1504,6 @@ static const struct agp_bridge_driver intel_g33_driver = { .configure = intel_i915_configure, .fetch_size = intel_i9xx_fetch_size, .cleanup = intel_i915_cleanup, - .tlb_flush = intel_i810_tlbflush, .mask_memory = intel_i965_mask_memory, .masks = intel_i810_masks, .agp_enable = intel_i810_agp_enable,