xserver: Branch 'master'

[Adam Jackson]

 hw/kdrive/src/kdrive.h     |    3 ---
 hw/kdrive/src/koffscreen.c |   23 -----------------------
 2 files changed, 26 deletions(-)

New commits:
commit 9a73bca859be12721ef62304b1422c455d4aec49
Author: Chris Ball <cjb at laptop.org>
Date:   Wed Jul 2 09:46:06 2008 -0400

    Remove KdOffscreenMarkUsed() as all its callers are gone.

diff --git a/hw/kdrive/src/kdrive.h b/hw/kdrive/src/kdrive.h
index 3e5af3a..212e016 100644
--- a/hw/kdrive/src/kdrive.h
+++ b/hw/kdrive/src/kdrive.h
@@ -843,9 +843,6 @@ KdOffscreenArea *
 KdOffscreenFree (ScreenPtr pScreen, KdOffscreenArea *area);
 
 void
-KdOffscreenMarkUsed (PixmapPtr pPixmap);
-
-void
 KdOffscreenSwapOut (ScreenPtr pScreen);
 
 void
diff --git a/hw/kdrive/src/koffscreen.c b/hw/kdrive/src/koffscreen.c
index f6ef52f..24ba7ff 100644
--- a/hw/kdrive/src/koffscreen.c
+++ b/hw/kdrive/src/koffscreen.c
@@ -309,29 +309,6 @@ KdOffscreenFree (ScreenPtr pScreen, KdOffscreenArea *area)
     return area;
 }
 
-void
-KdOffscreenMarkUsed (PixmapPtr pPixmap)
-{
-    KaaPixmapPriv (pPixmap);
-    KdScreenPriv (pPixmap->drawable.pScreen);
-    static int iter = 0;
-
-    if (!pKaaPixmap->area)
-	return;
-
-    /* The numbers here are arbitrary.  We may want to tune these. */
-    pKaaPixmap->area->score += 100;
-    if (++iter == 10) {
-	KdOffscreenArea *area;
-	for (area = pScreenPriv->off_screen_areas; area != NULL;
-	     area = area->next)
-	{
-	    if (area->state == KdOffscreenRemovable)
-		area->score = (area->score * 7) / 8;
-	}
-    }
-}
-
 Bool
 KdOffscreenInit (ScreenPtr pScreen)
 {