From patchwork Tue Mar 2 08:22:35 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 83142 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 o228MUw1013051 for ; Tue, 2 Mar 2010 08:23:06 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0CB869F397; Tue, 2 Mar 2010 00:22:30 -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 6E4209F397 for ; Tue, 2 Mar 2010 00:22:27 -0800 (PST) Received: by mail.ffwll.ch (Postfix, from userid 1000) id B69CC20C1BD; Tue, 2 Mar 2010 09:22:26 +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 E6C4A20C433; Tue, 2 Mar 2010 09:22:12 +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 o228N7BB026172; Tue, 2 Mar 2010 09:23:07 +0100 Received: (from daniel@localhost) by fliege.ffwll.ch (8.14.3/8.14.3/Submit) id o228N6qt026171; Tue, 2 Mar 2010 09:23:06 +0100 From: Daniel Vetter To: intel-gfx@lists.freedesktop.org Date: Tue, 2 Mar 2010 09:22:35 +0100 Message-Id: X-Mailer: git-send-email 1.6.6.1 In-Reply-To: <9e33573053467e42d03de8ed74d1f1885b999cc3.1267517278.git.daniel.vetter@ffwll.ch> References: <9e33573053467e42d03de8ed74d1f1885b999cc3.1267517278.git.daniel.vetter@ffwll.ch> In-Reply-To: References: Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 04/13] i830_memory: kill i830_desribe_allocations 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:06 +0000 (UTC) diff --git a/src/i830.h b/src/i830.h index 0924d71..5789976 100644 --- a/src/i830.h +++ b/src/i830.h @@ -451,8 +451,6 @@ void i830_allocator_fini(ScrnInfoPtr scrn); i830_memory *i830_allocate_memory(ScrnInfoPtr scrn, const char *name, unsigned long size, unsigned long pitch, int flags, uint32_t tile_format); -void i830_describe_allocations(ScrnInfoPtr scrn, int verbosity, - const char *prefix); void i830_reset_allocations(ScrnInfoPtr scrn); void i830_free_3d_memory(ScrnInfoPtr scrn); void i830_free_memory(ScrnInfoPtr scrn, i830_memory * mem); diff --git a/src/i830_driver.c b/src/i830_driver.c index 75b3303..14d4432 100644 --- a/src/i830_driver.c +++ b/src/i830_driver.c @@ -1413,8 +1413,6 @@ static Bool I830EnterVT(int scrnIndex, int flags) if (!i830_bind_all_memory(scrn)) return FALSE; - i830_describe_allocations(scrn, 1, ""); - intel_batch_init(scrn); if (IS_I965G(intel)) diff --git a/src/i830_memory.c b/src/i830_memory.c index f1804f4..4202aa5 100644 --- a/src/i830_memory.c +++ b/src/i830_memory.c @@ -375,61 +375,6 @@ i830_memory *i830_allocate_memory(ScrnInfoPtr scrn, const char *name, return mem; } -void -i830_describe_allocations(ScrnInfoPtr scrn, int verbosity, const char *prefix) -{ - intel_screen_private *intel = intel_get_screen_private(scrn); - i830_memory *mem; - - if (intel->memory_list == NULL) { - xf86DrvMsgVerb(scrn->scrnIndex, X_INFO, verbosity, - "%sMemory allocator not initialized\n", prefix); - return; - } - - if (intel->memory_list->next->next == NULL) { - xf86DrvMsgVerb(scrn->scrnIndex, X_INFO, verbosity, - "%sNo memory allocations\n", prefix); - return; - } - - xf86DrvMsgVerb(scrn->scrnIndex, X_INFO, verbosity, - "%sFixed memory allocation layout:\n", prefix); - - for (mem = intel->memory_list->next; mem->next != NULL; mem = mem->next) { - char phys_suffix[32] = ""; - char *tile_suffix = ""; - - if (mem->tiling_mode == I915_TILING_X) - tile_suffix = " X tiled"; - else if (mem->tiling_mode == I915_TILING_Y) - tile_suffix = " Y tiled"; - - xf86DrvMsgVerb(scrn->scrnIndex, X_INFO, verbosity, - "%s0x%08lx: %s (%ld kB%s)%s\n", prefix, - mem->bo->offset, mem->name, - mem->size / 1024, phys_suffix, tile_suffix); - } - xf86DrvMsgVerb(scrn->scrnIndex, X_INFO, verbosity, - "%s0x%08lx: end of aperture\n", - prefix, intel->FbMapSize); - - xf86DrvMsgVerb(scrn->scrnIndex, X_INFO, verbosity, - "%sBO memory allocation layout:\n", prefix); - for (mem = intel->bo_list; mem != NULL; mem = mem->next) { - char *tile_suffix = ""; - - if (mem->tiling_mode == I915_TILING_X) - tile_suffix = " X tiled"; - else if (mem->tiling_mode == I915_TILING_Y) - tile_suffix = " Y tiled"; - - xf86DrvMsgVerb(scrn->scrnIndex, X_INFO, verbosity, - "%sunpinned : %s (%ld kB)%s\n", prefix, - mem->name, mem->size / 1024, tile_suffix); - } -} - static Bool IsTileable(ScrnInfoPtr scrn, int pitch) { intel_screen_private *intel = intel_get_screen_private(scrn); diff --git a/src/i915_hwmc.c b/src/i915_hwmc.c index 43b9fcc..9721eba 100644 --- a/src/i915_hwmc.c +++ b/src/i915_hwmc.c @@ -357,9 +357,6 @@ static Bool i915_allocate_xvmc_buffers(ScrnInfoPtr scrn, return FALSE; } - if (1) - i830_describe_allocations(scrn, 1, "i915_mc: "); - return TRUE; } @@ -604,9 +601,6 @@ static int i915_xvmc_create_surface(ScrnInfoPtr scrn, XvMCSurfacePtr pSurf, return BadAlloc; } - if (0) - i830_describe_allocations(scrn, 1, ""); - if (drmAddMap(intel->drmSubFD, (drm_handle_t) (sfpriv->surface->bo->offset + intel->LinearAddr), sfpriv->surface->size,