Attachment 31477 Details for Bug 24300 – Patch that reverts EXA defragmentation

[patch] Patch that reverts EXA defragmentation

0001-Revert-EXA-Defragment-offscreen-memory.patch (text/plain), 14.15 KB, created by Oldrich Jedlicka on 2009-11-25 11:49:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Oldrich Jedlicka

Created: 2009-11-25 11:49:09 UTC

Size: 14.15 KB

patch

obsolete

>From e8ce71c5ee80dacd61eac351969657b51eeb74cf Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Old=C5=99ich=20Jedli=C4=8Dka?= <oldium.pro@seznam.cz>
>Date: Wed, 25 Nov 2009 20:24:35 +0100
>Subject: [PATCH] Revert "EXA: Defragment offscreen memory."
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>This reverts commit 510cbd43cd4e34bd459e8f74ab2855714b4ca95d.
>
>Conflicts (solved):
>
>	exa/exa.h
>	exa/exa_offscreen.c
>
>Signed-off-by: OldÅich JedliÄka <oldium.pro@seznam.cz>
>---
> exa/exa.c           |   53 ------------
> exa/exa.h           |    3 -
> exa/exa_offscreen.c |  229 +++------------------------------------------------
> exa/exa_priv.h      |    8 --
> 4 files changed, 11 insertions(+), 282 deletions(-)
>
>diff --git a/exa/exa.c b/exa/exa.c
>index e264d44..14a14c4 100644
>--- a/exa/exa.c
>+++ b/exa/exa.c
>@@ -767,50 +767,6 @@ exaCreateScreenResources(ScreenPtr pScreen)
>     return TRUE;
> }
> 
>-static void
>-ExaBlockHandler(int screenNum, pointer blockData, pointer pTimeout,
>-		pointer pReadmask)
>-{
>-    ScreenPtr pScreen = screenInfo.screens[screenNum];
>-    ExaScreenPriv(pScreen);
>-
>-    unwrap(pExaScr, pScreen, BlockHandler);
>-    (*pScreen->BlockHandler) (screenNum, blockData, pTimeout, pReadmask);
>-    wrap(pExaScr, pScreen, BlockHandler, ExaBlockHandler);
>-
>-    /* Try and keep the offscreen memory area tidy every now and then (at most 
>-     * once per second) when the server has been idle for at least 100ms.
>-     */
>-    if (pExaScr->numOffscreenAvailable > 1) {
>-	CARD32 now = GetTimeInMillis();
>-
>-	pExaScr->nextDefragment = now +
>-	    max(100, (INT32)(pExaScr->lastDefragment + 1000 - now));
>-	AdjustWaitForDelay(pTimeout, pExaScr->nextDefragment - now);
>-    }
>-}
>-
>-static void
>-ExaWakeupHandler(int screenNum, pointer wakeupData, unsigned long result,
>-		 pointer pReadmask)
>-{
>-    ScreenPtr pScreen = screenInfo.screens[screenNum];
>-    ExaScreenPriv(pScreen);
>-
>-    unwrap(pExaScr, pScreen, WakeupHandler);
>-    (*pScreen->WakeupHandler) (screenNum, wakeupData, result, pReadmask);
>-    wrap(pExaScr, pScreen, WakeupHandler, ExaWakeupHandler);
>-
>-    if (result == 0 && pExaScr->numOffscreenAvailable > 1) {
>-	CARD32 now = GetTimeInMillis();
>-
>-	if ((int)(now - pExaScr->nextDefragment) > 0) {
>-	    ExaOffscreenDefragment(pScreen);
>-	    pExaScr->lastDefragment = now;
>-	}
>-    }
>-}
>-
> /**
>  * exaCloseScreen() unwraps its wrapped screen functions and tears down EXA's
>  * screen private, before calling down to the next CloseSccreen.
>@@ -826,10 +782,6 @@ exaCloseScreen(int i, ScreenPtr pScreen)
>     if (ps->Glyphs == exaGlyphs)
> 	exaGlyphsFini(pScreen);
> 
>-    if (pScreen->BlockHandler == ExaBlockHandler)
>-	unwrap(pExaScr, pScreen, BlockHandler);
>-    if (pScreen->WakeupHandler == ExaWakeupHandler)
>-	unwrap(pExaScr, pScreen, WakeupHandler);
>     unwrap(pExaScr, pScreen, CreateGC);
>     unwrap(pExaScr, pScreen, CloseScreen);
>     unwrap(pExaScr, pScreen, GetImage);
>@@ -990,11 +942,6 @@ exaDriverInit (ScreenPtr		pScreen,
>     /*
>      * Replace various fb screen functions
>      */
>-    if ((pExaScr->info->flags & EXA_OFFSCREEN_PIXMAPS) &&
>-	!(pExaScr->info->flags & EXA_HANDLES_PIXMAPS)) {
>-	wrap(pExaScr, pScreen, BlockHandler, ExaBlockHandler);
>-	wrap(pExaScr, pScreen, WakeupHandler, ExaWakeupHandler);
>-    }
>     wrap(pExaScr, pScreen, CreateGC, exaCreateGC);
>     wrap(pExaScr, pScreen, CloseScreen, exaCloseScreen);
>     wrap(pExaScr, pScreen, GetImage, exaGetImage);
>diff --git a/exa/exa.h b/exa/exa.h
>index 4b39473..d6f5e5f 100644
>--- a/exa/exa.h
>+++ b/exa/exa.h
>@@ -66,9 +66,6 @@ struct _ExaOffscreenArea {
>     ExaOffscreenArea    *next;
> 
>     unsigned            eviction_cost;
>-
>-    ExaOffscreenArea    *prev;          /* Double-linked list for defragmentation */
>-    int                 align;          /* required alignment */
> };
> 
> /**
>diff --git a/exa/exa_offscreen.c b/exa/exa_offscreen.c
>index eb53b2a..54bce41 100644
>--- a/exa/exa_offscreen.c
>+++ b/exa/exa_offscreen.c
>@@ -169,7 +169,7 @@ exaOffscreenAlloc (ScreenPtr pScreen, int size, int align,
> {
>     ExaOffscreenArea *area;
>     ExaScreenPriv (pScreen);
>-    int real_size = 0, free_total = 0, largest_avail = 0;
>+    int real_size = 0;
> #if DEBUG_OFFSCREEN
>     static int number = 0;
>     ErrorF("================= ============ allocating a new pixmap %d\n", ++number);
>@@ -207,32 +207,6 @@ exaOffscreenAlloc (ScreenPtr pScreen, int size, int align,
> 	/* does it fit? */
> 	if (real_size <= area->size)
> 	    break;
>-
>-	free_total += area->size;
>-
>-	if (area->size > largest_avail)
>-	    largest_avail = area->size;
>-    }
>-
>-    if (!area && free_total >= size) {
>-	CARD32 now = GetTimeInMillis();
>-
>-	/* Don't defragment more than once per second, to avoid adding more
>-	 * overhead than we're trying to prevent
>-	 */
>-	if (abs((INT32) (now - pExaScr->lastDefragment)) > 1000) {
>-	    area = ExaOffscreenDefragment(pScreen);
>-	    pExaScr->lastDefragment = now;
>-
>-	    if (area) {
>-		/* adjust size to match alignment requirement */
>-		real_size = size + (area->base_offset + area->size - size) % align;
>-
>-		/* does it fit? */
>-		if (real_size > area->size)
>-		    area = NULL;
>-	    }
>-	}
>     }
> 
>     if (!area)
>@@ -271,27 +245,17 @@ exaOffscreenAlloc (ScreenPtr pScreen, int size, int align,
> 	ExaOffscreenArea   *new_area = xalloc (sizeof (ExaOffscreenArea));
> 	if (!new_area)
> 	    return NULL;
>-	new_area->base_offset = area->base_offset;
>-
>+	new_area->base_offset = area->base_offset + real_size;
> 	new_area->offset = new_area->base_offset;
>-	new_area->align = 0;
> 	new_area->size = area->size - real_size;
> 	new_area->state = ExaOffscreenAvail;
> 	new_area->save = NULL;
> 	new_area->last_use = 0;
> 	new_area->eviction_cost = 0;
>-	new_area->next = area;
>-	new_area->prev = area->prev;
>-	if (area->prev->next)
>-	    area->prev->next = new_area;
>-	else
>-	    pExaScr->info->offScreenAreas = new_area;
>-	area->prev = new_area;
>-	area->base_offset = new_area->base_offset + new_area->size;
>+	new_area->next = area->next;
>+	area->next = new_area;
> 	area->size = real_size;
>-    } else
>-	pExaScr->numOffscreenAvailable--;
>-
>+    }
>     /*
>      * Mark this area as in use
>      */
>@@ -304,7 +268,6 @@ exaOffscreenAlloc (ScreenPtr pScreen, int size, int align,
>     area->last_use = pExaScr->offScreenCounter++;
>     area->offset = (area->base_offset + align - 1);
>     area->offset -= area->offset % align;
>-    area->align = align;
> 
>     ExaOffscreenValidate (pScreen);
> 
>@@ -419,7 +382,7 @@ exaEnableDisableFBAccess (int index, Bool enable)
> 
> /* merge the next free area into this one */
> static void
>-ExaOffscreenMerge (ExaScreenPrivPtr pExaScr, ExaOffscreenArea *area)
>+ExaOffscreenMerge (ExaOffscreenArea *area)
> {
>     ExaOffscreenArea	*next = area->next;
> 
>@@ -427,13 +390,7 @@ ExaOffscreenMerge (ExaScreenPrivPtr pExaScr, ExaOffscreenArea *area)
>     area->size += next->size;
>     /* frob pointer */
>     area->next = next->next;
>-    if (area->next)
>-	area->next->prev = area;
>-    else
>-	pExaScr->info->offScreenAreas->prev = area;
>     xfree (next);
>-
>-    pExaScr->numOffscreenAvailable--;
> }
> 
> /**
>@@ -470,19 +427,19 @@ exaOffscreenFree (ScreenPtr pScreen, ExaOffscreenArea *area)
>     if (area == pExaScr->info->offScreenAreas)
> 	prev = NULL;
>     else
>-	prev = area->prev;
>-
>-    pExaScr->numOffscreenAvailable++;
>+	for (prev = pExaScr->info->offScreenAreas; prev; prev = prev->next)
>+	    if (prev->next == area)
>+		break;
> 
>     /* link with next area if free */
>     if (next && next->state == ExaOffscreenAvail)
>-	ExaOffscreenMerge (pExaScr, area);
>+	ExaOffscreenMerge (area);
> 
>     /* link with prev area if free */
>     if (prev && prev->state == ExaOffscreenAvail)
>     {
> 	area = prev;
>-	ExaOffscreenMerge (pExaScr, area);
>+	ExaOffscreenMerge (area);
>     }
> 
>     ExaOffscreenValidate (pScreen);
>@@ -503,167 +460,6 @@ ExaOffscreenMarkUsed (PixmapPtr pPixmap)
> }
> 
> /**
>- * Defragment offscreen memory by compacting allocated areas at the end of it,
>- * leaving the total amount of memory available as a single area at the
>- * beginning (when there are no pinned allocations).
>- */
>-_X_HIDDEN ExaOffscreenArea*
>-ExaOffscreenDefragment (ScreenPtr pScreen)
>-{
>-    ExaScreenPriv (pScreen);
>-    ExaOffscreenArea *area, *largest_available = NULL;
>-    int largest_size = 0;
>-    PixmapPtr pDstPix;
>-    ExaPixmapPrivPtr pExaDstPix;
>-
>-    pDstPix = (*pScreen->CreatePixmap) (pScreen, 0, 0, 0, 0);
>-
>-    if (!pDstPix)
>-	return NULL;
>-
>-    pExaDstPix = ExaGetPixmapPriv (pDstPix);
>-    pExaDstPix->offscreen = TRUE;
>-
>-    for (area = pExaScr->info->offScreenAreas->prev;
>-	 area != pExaScr->info->offScreenAreas;
>-	 )
>-    {
>-	ExaOffscreenArea *prev = area->prev;
>-	PixmapPtr pSrcPix;
>-	ExaPixmapPrivPtr pExaSrcPix;
>-	Bool save_offscreen;
>-	int save_pitch;
>-
>-	if (area->state != ExaOffscreenAvail ||
>-	    prev->state == ExaOffscreenLocked ||
>-	    (prev->state == ExaOffscreenRemovable &&
>-	     prev->save != exaPixmapSave)) {
>-	    area = prev;
>-	    continue;
>-	}
>-
>-	if (prev->state == ExaOffscreenAvail) {
>-	    if (area == largest_available) {
>-		largest_available = prev;
>-		largest_size += prev->size;
>-	    }
>-	    area = prev;
>-	    ExaOffscreenMerge (pExaScr, area);
>-	    continue;
>-	}
>-
>-	if (area->size > largest_size) {
>-	    largest_available = area;
>-	    largest_size = area->size;
>-	}
>-
>-	pSrcPix = prev->privData;
>-	pExaSrcPix = ExaGetPixmapPriv (pSrcPix);
>-
>-	pExaDstPix->fb_ptr = pExaScr->info->memoryBase +
>-	    area->base_offset + area->size - prev->size + prev->base_offset -
>-	    prev->offset;
>-	pExaDstPix->fb_ptr -= (unsigned long)pExaDstPix->fb_ptr % prev->align;
>-
>-	if (pExaDstPix->fb_ptr <= pExaSrcPix->fb_ptr) {
>-	    area = prev;
>-	    continue;
>-	}
>-
>-	if (!(pExaScr->info->flags & EXA_SUPPORTS_OFFSCREEN_OVERLAPS) &&
>-	    (pExaSrcPix->fb_ptr + prev->size) > pExaDstPix->fb_ptr) {
>-	    area = prev;
>-	    continue;
>-	}
>-
>-	save_offscreen = pExaSrcPix->offscreen;
>-	save_pitch = pSrcPix->devKind;
>-
>-	pExaSrcPix->offscreen = TRUE;
>-	pSrcPix->devKind = pExaSrcPix->fb_pitch;
>-
>-	pDstPix->drawable.width = pSrcPix->drawable.width;
>-	pDstPix->devKind = pSrcPix->devKind;
>-	pDstPix->drawable.height = pSrcPix->drawable.height;
>-	pDstPix->drawable.depth = pSrcPix->drawable.depth;
>-	pDstPix->drawable.bitsPerPixel = pSrcPix->drawable.bitsPerPixel;
>-
>-	if (!pExaScr->info->PrepareCopy (pSrcPix, pDstPix, -1, -1, GXcopy, ~0)) {
>-	    pExaSrcPix->offscreen = save_offscreen;
>-	    pSrcPix->devKind = save_pitch;
>-	    area = prev;
>-	    continue;
>-	}
>-
>-	pExaScr->info->Copy (pDstPix, 0, 0, 0, 0, pDstPix->drawable.width,
>-			     pDstPix->drawable.height);
>-	pExaScr->info->DoneCopy (pDstPix);
>-	exaMarkSync (pScreen);
>-
>-	DBG_OFFSCREEN(("Before swap: prev=0x%08x-0x%08x-0x%08x area=0x%08x-0x%08x-0x%08x\n",
>-		       prev->base_offset, prev->offset, prev->base_offset + prev->size,
>-		       area->base_offset, area->offset, area->base_offset + area->size));
>-
>-	/* Calculate swapped area offsets and sizes */
>-	area->base_offset = prev->base_offset;
>-	area->offset = area->base_offset;
>-	prev->offset += pExaDstPix->fb_ptr - pExaSrcPix->fb_ptr;
>-	assert(prev->offset >= pExaScr->info->offScreenBase &&
>-	       prev->offset < pExaScr->info->memorySize);
>-	prev->base_offset = prev->offset;
>-	if (area->next)
>-	    prev->size = area->next->base_offset - prev->base_offset;
>-	else
>-	    prev->size = pExaScr->info->memorySize - prev->base_offset;
>-	area->size = prev->base_offset - area->base_offset;
>-
>-	DBG_OFFSCREEN(("After swap: area=0x%08x-0x%08x-0x%08x prev=0x%08x-0x%08x-0x%08x\n",
>-		       area->base_offset, area->offset, area->base_offset + area->size,
>-		       prev->base_offset, prev->offset, prev->base_offset + prev->size));
>-
>-	/* Swap areas in list */
>-	if (area->next)
>-	    area->next->prev = prev;
>-	else
>-	    pExaScr->info->offScreenAreas->prev = prev;
>-	if (prev->prev->next)
>-	    prev->prev->next = area;
>-	else
>-	    pExaScr->info->offScreenAreas = area;
>-	prev->next = area->next;
>-	area->next = prev;
>-	area->prev = prev->prev;
>-	prev->prev = area;
>-	if (!area->prev->next)
>-	    pExaScr->info->offScreenAreas = area;
>-
>-#if DEBUG_OFFSCREEN
>-	if (prev->prev == prev || prev->next == prev)
>-	    ErrorF("Whoops, prev points to itself!\n");
>-
>-	if (area->prev == area || area->next == area)
>-	    ErrorF("Whoops, area points to itself!\n");
>-#endif
>-
>-	pExaSrcPix->fb_ptr = pExaDstPix->fb_ptr;
>-	pExaSrcPix->offscreen = save_offscreen;
>-	pSrcPix->devKind = save_pitch;
>-    }
>-
>-    pDstPix->drawable.width = 0;
>-    pDstPix->drawable.height = 0;
>-    pDstPix->drawable.depth = 0;
>-    pDstPix->drawable.bitsPerPixel = 0;
>-
>-    (*pScreen->DestroyPixmap) (pDstPix);
>-
>-    if (area->state == ExaOffscreenAvail && area->size > largest_size)
>-	return area;
>-
>-    return largest_available;
>-}
>-
>-/**
>  * exaOffscreenInit initializes the offscreen memory manager.
>  *
>  * @param pScreen current screen
>@@ -686,18 +482,15 @@ exaOffscreenInit (ScreenPtr pScreen)
>     area->state = ExaOffscreenAvail;
>     area->base_offset = pExaScr->info->offScreenBase;
>     area->offset = area->base_offset;
>-    area->align = 0;
>     area->size = pExaScr->info->memorySize - area->base_offset;
>     area->save = NULL;
>     area->next = NULL;
>-    area->prev = area;
>     area->last_use = 0;
>     area->eviction_cost = 0;
> 
>     /* Add it to the free areas */
>     pExaScr->info->offScreenAreas = area;
>     pExaScr->offScreenCounter = 1;
>-    pExaScr->numOffscreenAvailable = 1;
> 
>     ExaOffscreenValidate (pScreen);
> 
>diff --git a/exa/exa_priv.h b/exa/exa_priv.h
>index 1aec8e9..ea8addb 100644
>--- a/exa/exa_priv.h
>+++ b/exa/exa_priv.h
>@@ -152,8 +152,6 @@ typedef struct _ExaMigrationRec {
> typedef void (*EnableDisableFBAccessProcPtr)(int, Bool);
> typedef struct {
>     ExaDriverPtr info;
>-    ScreenBlockHandlerProcPtr	 SavedBlockHandler;
>-    ScreenWakeupHandlerProcPtr	 SavedWakeupHandler;
>     CreateGCProcPtr 		 SavedCreateGC;
>     CloseScreenProcPtr 		 SavedCloseScreen;
>     GetImageProcPtr 		 SavedGetImage;
>@@ -185,9 +183,6 @@ typedef struct {
>     unsigned			 disableFbCount;
>     Bool			 optimize_migration;
>     unsigned			 offScreenCounter;
>-    unsigned			 numOffscreenAvailable;
>-    CARD32			 lastDefragment;
>-    CARD32			 nextDefragment;
> 
>     /* Reference counting for accessed pixmaps */
>     struct {
>@@ -502,9 +497,6 @@ ExaOffscreenSwapOut (ScreenPtr pScreen);
> void
> ExaOffscreenSwapIn (ScreenPtr pScreen);
> 
>-ExaOffscreenArea*
>-ExaOffscreenDefragment (ScreenPtr pScreen);
>-
> Bool
> exaOffscreenInit(ScreenPtr pScreen);
> 
>-- 
>1.6.5.3
>

Actions: View | Splinter Review

Attachments on bug 24300: 30031 | 30032 | 30035 | 30036 | 30063 | 30066 | 30067 | 30068 | 30072 | 31477 | 31504 | 31531 | 31597

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.