From patchwork Tue Mar 2 08:22:37 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 83152 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 o228N7mr013233 for ; Tue, 2 Mar 2010 08:23:48 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id AD41E9F39B; Tue, 2 Mar 2010 00:22:35 -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 0F5E29F39B for ; Tue, 2 Mar 2010 00:22:32 -0800 (PST) Received: by mail.ffwll.ch (Postfix, from userid 1000) id 62C5F20C433; Tue, 2 Mar 2010 09:22:31 +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-+--signed-off-by, 0.000-+--signedoffby 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.967-+--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 A58C020C435; Tue, 2 Mar 2010 09:22:13 +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 o228N7A5026180; Tue, 2 Mar 2010 09:23:07 +0100 Received: (from daniel@localhost) by fliege.ffwll.ch (8.14.3/8.14.3/Submit) id o228N7mL026179; Tue, 2 Mar 2010 09:23:07 +0100 From: Daniel Vetter To: intel-gfx@lists.freedesktop.org Date: Tue, 2 Mar 2010 09:22:37 +0100 Message-Id: <6ab3c1a8d7cea47c0a26dadf5b7f742443e28568.1267517278.git.daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.6.6.1 In-Reply-To: <99c9af5f2a445be52d5f47058298c2d280600654.1267517278.git.daniel.vetter@ffwll.ch> References: <9e33573053467e42d03de8ed74d1f1885b999cc3.1267517278.git.daniel.vetter@ffwll.ch> <99c9af5f2a445be52d5f47058298c2d280600654.1267517278.git.daniel.vetter@ffwll.ch> In-Reply-To: References: Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 06/13] i830_memory: rename i830_bind_all_memory to reflect code reality 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:48 +0000 (UTC) diff --git a/src/i830.h b/src/i830.h index 45b6028..8449dc6 100644 --- a/src/i830.h +++ b/src/i830.h @@ -462,7 +462,7 @@ Bool i830_tiled_width(intel_screen_private *intel, int *width, int cpp); int i830_pad_drawable_width(int width, int cpp); /* i830_memory.c */ -Bool i830_bind_all_memory(ScrnInfoPtr scrn); +Bool i830_reinit_memory(ScrnInfoPtr scrn); unsigned long i830_get_fence_size(intel_screen_private *intel, unsigned long size); unsigned long i830_get_fence_pitch(intel_screen_private *intel, unsigned long pitch, uint32_t tiling_mode); diff --git a/src/i830_driver.c b/src/i830_driver.c index 4b2e617..733f409 100644 --- a/src/i830_driver.c +++ b/src/i830_driver.c @@ -1403,7 +1403,7 @@ static Bool I830EnterVT(int scrnIndex, int flags) } } - if (!i830_bind_all_memory(scrn)) + if (!i830_reinit_memory(scrn)) return FALSE; intel_batch_init(scrn); diff --git a/src/i830_memory.c b/src/i830_memory.c index 0d7ae43..2c00d43 100644 --- a/src/i830_memory.c +++ b/src/i830_memory.c @@ -439,13 +439,10 @@ Bool i830_allocate_2d_memory(ScrnInfoPtr scrn) } /** - * Called at EnterVT to grab the AGP GART and bind our allocations. - * - * In zaphod mode, this will walk the list trying to bind twice, since each - * intel points to the same allocation list, but the bind_memory will just - * no-op then. + * Called at EnterVT to reinit memory related stuff. Also reinits the drmmode + * cursors. */ -Bool i830_bind_all_memory(ScrnInfoPtr scrn) +Bool i830_reinit_memory(ScrnInfoPtr scrn) { intel_screen_private *intel = intel_get_screen_private(scrn); xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);