From patchwork Tue Mar 2 08:22:44 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 83150 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 o228N6J9013217 for ; Tue, 2 Mar 2010 08:23:47 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 76E8F9F4C9; Tue, 2 Mar 2010 00:22:55 -0800 (PST) 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 A30DB9F396 for ; Tue, 2 Mar 2010 00:22:53 -0800 (PST) Received: by mail.ffwll.ch (Postfix, from userid 1000) id F0D5A20C43B; Tue, 2 Mar 2010 09:22:52 +0100 (CET) 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-+--100644, 0.000-+--signedoffby, 0.000-+--signed-off-by X-Spam-Status: No, score=-4.4 required=6.0 tests=ALL_TRUSTED,BAYES_00 autolearn=ham version=3.2.5 X-Spam-Spammy: 0.966-+--H*m:ffwll, 0.962-+--H*Ad:U*daniel.vetter, 0.951-+--H*Ad:D*ffwll.ch Received: from fliege.ffwll.ch (unknown [192.168.23.131]) by mail.ffwll.ch (Postfix) with ESMTP id 5A9E120C43D; Tue, 2 Mar 2010 09:22:16 +0100 (CET) Received: from fliege.ffwll.ch (localhost.localdomain [127.0.0.1]) by fliege.ffwll.ch (8.14.3/8.14.3) with ESMTP id o228NA5A026209; Tue, 2 Mar 2010 09:23:10 +0100 Received: (from daniel@localhost) by fliege.ffwll.ch (8.14.3/8.14.3/Submit) id o228NAbq026207; Tue, 2 Mar 2010 09:23:10 +0100 From: Daniel Vetter To: intel-gfx@lists.freedesktop.org Date: Tue, 2 Mar 2010 09:22:44 +0100 Message-Id: X-Mailer: git-send-email 1.6.6.1 In-Reply-To: References: <9e33573053467e42d03de8ed74d1f1885b999cc3.1267517278.git.daniel.vetter@ffwll.ch> <99c9af5f2a445be52d5f47058298c2d280600654.1267517278.git.daniel.vetter@ffwll.ch> <6ab3c1a8d7cea47c0a26dadf5b7f742443e28568.1267517278.git.daniel.vetter@ffwll.ch> <985e3640a3bba172450fe64a2e8dbfb35caef36c.1267517278.git.daniel.vetter@ffwll.ch> <25c9668d24ab522a66b1551bab77613f992c30f9.1267517278.git.daniel.vetter@ffwll.ch> In-Reply-To: References: Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 13/13] i830_memory: hide as much of the old memory allocator as possible 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, 02 Mar 2010 08:23:47 +0000 (UTC) diff --git a/src/i830.h b/src/i830.h index 8482ca9..46cdd6c 100644 --- a/src/i830.h +++ b/src/i830.h @@ -430,14 +430,8 @@ extern Bool i830_crtc_on(xf86CrtcPtr crtc); extern int i830_crtc_to_pipe(xf86CrtcPtr crtc); extern Bool I830AccelInit(ScreenPtr pScreen); -i830_memory *i830_allocate_memory(ScrnInfoPtr scrn, const char *name, - unsigned long size, unsigned long pitch, - int flags, uint32_t tile_format); void i830_reset_allocations(ScrnInfoPtr scrn); -void i830_free_3d_memory(ScrnInfoPtr scrn); -void i830_free_memory(ScrnInfoPtr scrn, i830_memory * mem); Bool i830_allocate_2d_memory(ScrnInfoPtr scrn); -Bool i830_allocate_3d_memory(ScrnInfoPtr scrn); void i830_init_bufmgr(ScrnInfoPtr scrn); #ifdef INTEL_XVMC Bool i830_allocate_xvmc_buffer(ScrnInfoPtr scrn, const char *name, diff --git a/src/i830_memory.c b/src/i830_memory.c index 089667d..c6003a5 100644 --- a/src/i830_memory.c +++ b/src/i830_memory.c @@ -163,7 +163,7 @@ i830_check_display_stride(ScrnInfoPtr scrn, int stride, Bool tiling) return FALSE; } -void i830_free_memory(ScrnInfoPtr scrn, i830_memory * mem) +static void i830_free_memory(ScrnInfoPtr scrn, i830_memory * mem) { intel_screen_private *intel = intel_get_screen_private(scrn); @@ -228,7 +228,7 @@ void i830_reset_allocations(ScrnInfoPtr scrn) * the entire Screen lifetime. This means not using buffer objects, which * get their offsets chosen at each EnterVT time. */ -i830_memory *i830_allocate_memory(ScrnInfoPtr scrn, const char *name, +static i830_memory *i830_allocate_memory(ScrnInfoPtr scrn, const char *name, unsigned long size, unsigned long pitch, int flags, uint32_t tiling_mode) {