xserver: Branch 'master' - 2 commits

[Eric Anholt]

 exa/exa.c                  |    2 +-
 exa/exa.h                  |    6 ++++++
 exa/exa_priv.h             |    6 ------
 hw/xfree86/exa/exa.man.pre |    2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

New commits:
diff-tree 083b790515faaf134a78abc4b0a7ef0d6ea5db75 (from cfbc7379f0232bb336461f6d2a8496d3d0763e7e)
Author: Eric Anholt <eric at anholt.net>
Date:   Thu Dec 28 13:21:25 2006 -0800

    Switch the default migration heuristic for EXA to "always".
    
    This has been what has been used the most successfully post-damagetrack.
    The current thinking is that:
    1) We should be able to accelerate basically everything.  So we don't need to
       try to migrate trees of pixmaps permanently out of framebuffer to speed
       CPU drawing up.
    2) Migration is cheaper in the thrashing case, so we don't want to go to a lot
       of effort to try (and fail badly) to find a working set.

diff --git a/exa/exa.c b/exa/exa.c
index e61bc69..e9f42df 100644
--- a/exa/exa.c
+++ b/exa/exa.c
@@ -622,7 +622,7 @@ exaDriverInit (ScreenPtr		pScreen,
 
     pScreen->devPrivates[exaScreenPrivateIndex].ptr = (pointer) pExaScr;
 
-    pExaScr->migration = ExaMigrationSmart;
+    pExaScr->migration = ExaMigrationAlways;
 
     exaDDXDriverInit(pScreen);
 
diff --git a/hw/xfree86/exa/exa.man.pre b/hw/xfree86/exa/exa.man.pre
index ea41b90..b0eecd5 100644
--- a/hw/xfree86/exa/exa.man.pre
+++ b/hw/xfree86/exa/exa.man.pre
@@ -35,6 +35,6 @@ Default: No.
 Chooses an alternate pixmap migration heuristic, for debugging purposes.  The
 default is intended to be the best performing one for general use, though others
 may help with specific use cases.  Available options include \*qalways\*q,
-\*qgreedy\*q, and \*qsmart\*q.  Default: smart.
+\*qgreedy\*q, and \*qsmart\*q.  Default: always.
 .SH AUTHORS
 Authors include: Keith Packard, Eric Anholt, Zack Rusin, and Michel Dänzer
diff-tree cfbc7379f0232bb336461f6d2a8496d3d0763e7e (from 683ca3f7afaf15fd3ca7918f6175b5a9e4a6f05b)
Author: Eric Anholt <eric at anholt.net>
Date:   Thu Dec 28 13:15:11 2006 -0800

    Export exaMove{In,Out}Pixmap().

diff --git a/exa/exa.h b/exa/exa.h
index 96465a7..b043c12 100644
--- a/exa/exa.h
+++ b/exa/exa.h
@@ -716,6 +716,12 @@ exaGetPixmapSize(PixmapPtr pPix);
 void
 exaEnableDisableFBAccess (int index, Bool enable);
 
+void
+exaMoveInPixmap (PixmapPtr pPixmap);
+
+void
+exaMoveOutPixmap (PixmapPtr pPixmap);
+
 /**
  * Returns TRUE if the given planemask covers all the significant bits in the
  * pixel values for pDrawable.
diff --git a/exa/exa_priv.h b/exa/exa_priv.h
index 926e02a..403d4b6 100644
--- a/exa/exa_priv.h
+++ b/exa/exa_priv.h
@@ -412,10 +412,4 @@ exaGlyphs (CARD8	op,
 void
 exaDoMigration (ExaMigrationPtr pixmaps, int npixmaps, Bool can_accel);
 
-void
-exaMoveInPixmap (PixmapPtr pPixmap);
-
-void
-exaMoveOutPixmap (PixmapPtr pPixmap);
-
 #endif /* EXAPRIV_H */