xserver: Branch 'master' - 2 commits

[Maarten Maathuis]

 exa/exa.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit a635bb5357648779815ec6729d55f6b478493213
Author: Maarten Maathuis <madman2003 at gmail.com>
Date:   Tue Mar 17 19:34:45 2009 +0100

    exa: round of fb_pitch to the next byte

diff --git a/exa/exa.c b/exa/exa.c
index 3fcb3e2..ecb2117 100644
--- a/exa/exa.c
+++ b/exa/exa.c
@@ -258,9 +258,9 @@ exaSetFbPitch(ExaScreenPrivPtr pExaScr, ExaPixmapPrivPtr pExaPixmap,
               int w, int h, int bpp)
 {
     if (pExaScr->info->flags & EXA_OFFSCREEN_ALIGN_POT && w != 1)
-        pExaPixmap->fb_pitch = (1 << (exaLog2(w - 1) + 1)) * bpp / 8;
+        pExaPixmap->fb_pitch = ((1 << (exaLog2(w - 1) + 1)) * bpp + 7) / 8;
     else
-        pExaPixmap->fb_pitch = w * bpp / 8;
+        pExaPixmap->fb_pitch = (w * bpp + 7) / 8;
 
     pExaPixmap->fb_pitch = EXA_ALIGN(pExaPixmap->fb_pitch,
                                      pExaScr->info->pixmapPitchAlign);
commit ec328783593339e33772301a8c5fea35fd63c0a2
Author: Maarten Maathuis <madman2003 at gmail.com>
Date:   Tue Mar 17 10:45:21 2009 +0100

    exa: check if the pixmap is pinned for unsupported AUX indices.

diff --git a/exa/exa.c b/exa/exa.c
index 7145e12..3fcb3e2 100644
--- a/exa/exa.c
+++ b/exa/exa.c
@@ -585,6 +585,8 @@ ExaDoPrepareAccess(DrawablePtr pDrawable, int index)
 
     if (index >= EXA_PREPARE_AUX_DEST &&
 	!(pExaScr->info->flags & EXA_SUPPORTS_PREPARE_AUX)) {
+	if (pExaPixmap->score == EXA_PIXMAP_SCORE_PINNED)
+	    FatalError("Unsupported AUX indices used on a pinned pixmap.\n");
 	exaMoveOutPixmap (pPixmap);
 	return FALSE;
     }