From patchwork Wed Apr 14 10:16:27 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 92379 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 o3EAH1nl018260 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Wed, 14 Apr 2010 10:17:39 GMT Received: from localhost ([127.0.0.1] helo=sfs-ml-2.v29.ch3.sourceforge.com) by sfs-ml-2.v29.ch3.sourceforge.com with esmtp (Exim 4.69) (envelope-from ) id 1O1zdY-0002Bs-Vl; Wed, 14 Apr 2010 10:16:00 +0000 Received: from sfi-mx-1.v28.ch3.sourceforge.com ([172.29.28.121] helo=mx.sourceforge.net) by sfs-ml-2.v29.ch3.sourceforge.com with esmtp (Exim 4.69) (envelope-from ) id 1O1zdY-0002Bn-1J for dri-devel@lists.sourceforge.net; Wed, 14 Apr 2010 10:16:00 +0000 X-ACL-Warn: Received: from cable-static-49-187.intergga.ch ([157.161.49.187] helo=localhost.localdomain) by sfi-mx-1.v28.ch3.sourceforge.com with esmtps (TLSv1:AES256-SHA:256) (Exim 4.69) id 1O1zdW-0007q7-Tm for dri-devel@lists.sourceforge.net; Wed, 14 Apr 2010 10:16:00 +0000 Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by localhost.localdomain (8.14.3/8.14.3) with ESMTP id o3EAGeca021128; Wed, 14 Apr 2010 12:16:40 +0200 Received: (from daniel@localhost) by localhost.localdomain (8.14.3/8.14.3/Submit) id o3EAGe8c021127; Wed, 14 Apr 2010 12:16:40 +0200 From: Daniel Vetter To: dri-devel@lists.sourceforge.net Date: Wed, 14 Apr 2010 12:16:27 +0200 Message-Id: <1271240189-21087-2-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.6.6.1 In-Reply-To: <1271240189-21087-1-git-send-email-daniel.vetter@ffwll.ch> References: <1271240189-21087-1-git-send-email-daniel.vetter@ffwll.ch> X-Helo-Check: bad, None Existant Host/Domain (localhost.localdomain) X-Spam-Score: 10.8 (++++++++++) X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. 0.8 HELO_LH_LD HELO_LH_LD 0.5 VA_HELO_CHECK Host Used Invalid or Forged HELO/EHLO 20 RCVD_IN_XBL RBL: Received via a relay in Spamhaus XBL [157.161.49.187 listed in zen.spamhaus.org] -10 AWL AWL: From: address is in the auto white-list X-VA-Spam-Flag: YES X-Spam-Flag: YES X-Headers-End: 1O1zdW-0007q7-Tm Subject: [SPAM] [PATCH 1/3] drm: kill drm_agp_chipset_flush Cc: intel-gfx@lists.freedesktop.org, Daniel Vetter 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: , MIME-Version: 1.0 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]); Wed, 14 Apr 2010 10:17:40 +0000 (UTC) diff --git a/drivers/gpu/drm/drm_agpsupport.c b/drivers/gpu/drm/drm_agpsupport.c index ba38e01..54cfbc4 100644 --- a/drivers/gpu/drm/drm_agpsupport.c +++ b/drivers/gpu/drm/drm_agpsupport.c @@ -497,11 +497,4 @@ drm_agp_bind_pages(struct drm_device *dev, return mem; } EXPORT_SYMBOL(drm_agp_bind_pages); - -void drm_agp_chipset_flush(struct drm_device *dev) -{ - agp_flush_chipset(dev->agp->bridge); -} -EXPORT_SYMBOL(drm_agp_chipset_flush); - #endif /* __OS_HAS_AGP */ diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 47c46ed..6e71b5b 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -1901,7 +1901,7 @@ i915_gem_flush(struct drm_device *dev, invalidate_domains, flush_domains); if (flush_domains & I915_GEM_DOMAIN_CPU) - drm_agp_chipset_flush(dev); + agp_flush_chipset(dev->agp->bridge); if ((invalidate_domains | flush_domains) & I915_GEM_GPU_DOMAINS) { /* @@ -2795,7 +2795,7 @@ i915_gem_object_flush_cpu_write_domain(struct drm_gem_object *obj) return; i915_gem_clflush_object(obj); - drm_agp_chipset_flush(dev); + agp_flush_chipset(dev->agp->bridge); old_write_domain = obj->write_domain; obj->write_domain = 0; @@ -4962,7 +4962,7 @@ void i915_gem_detach_phys_object(struct drm_device *dev, kunmap_atomic(dst, KM_USER0); } drm_clflush_pages(obj_priv->pages, page_count); - drm_agp_chipset_flush(dev); + agp_flush_chipset(dev->agp->bridge); i915_gem_object_put_pages(obj); out: @@ -5047,7 +5047,7 @@ i915_gem_phys_pwrite(struct drm_device *dev, struct drm_gem_object *obj, if (ret) return -EFAULT; - drm_agp_chipset_flush(dev); + agp_flush_chipset(dev->agp->bridge); return 0; } diff --git a/include/drm/drmP.h b/include/drm/drmP.h index c1b9871..12ffa05 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h @@ -1341,7 +1341,6 @@ extern DRM_AGP_MEM *drm_agp_allocate_memory(struct agp_bridge_data *bridge, size extern int drm_agp_free_memory(DRM_AGP_MEM * handle); extern int drm_agp_bind_memory(DRM_AGP_MEM * handle, off_t start); extern int drm_agp_unbind_memory(DRM_AGP_MEM * handle); -extern void drm_agp_chipset_flush(struct drm_device *dev); /* Stub support (drm_stub.h) */ extern int drm_setmaster_ioctl(struct drm_device *dev, void *data,