xserver: Branch 'server-1.8-branch' - 2 commits

[Peter Hutterer]

 exa/exa_unaccel.c |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 88ba993aaf3f810c6dfc1fb113d5d075eeb390b4
Author: Keith Packard <keithp at keithp.com>
Date:   Mon Apr 26 11:04:38 2010 -0700

    Exa screen private has SavedSourceValidate, not SourceValidate
    
    Need to check the right field to see if there is a wrapped
    SourceValidate function.
    
    Signed-off-by: Keith Packard <keithp at keithp.com>
    (cherry picked from commit 25d1c6cd37cc4079adf7c4bad8d10678fb08b409)

diff --git a/exa/exa_unaccel.c b/exa/exa_unaccel.c
index 7754502..8d70098 100644
--- a/exa/exa_unaccel.c
+++ b/exa/exa_unaccel.c
@@ -464,7 +464,7 @@ ExaSrcValidate(DrawablePtr pDrawable,
     REGION_UNION(pScreen, dst, dst, &reg);
     REGION_UNINIT(pScreen, &reg);
 
-    if (pExaScr->SourceValidate) {
+    if (pExaScr->SavedSourceValidate) {
         swap(pExaScr, pScreen, SourceValidate);
         pScreen->SourceValidate(pDrawable, x, y, width, height);
         swap(pExaScr, pScreen, SourceValidate);
commit 02e07e7e234f8e74b41148ba05e05b3446c7732a
Author: Jerome Glisse <jglisse at redhat.com>
Date:   Mon Apr 26 16:01:48 2010 +0200

    exa: avoid calling non existent SourceValidate callback
    
    In unaccel path we were unconditionaly calling the SourceValidate
    callback but in some case it could be NULL. Check if we have a
    valid callback before calling it.
    
    Signed-off-by: Jerome Glisse <jglisse at redhat.com>
    Acked-by: Michel Dänzer <michel at daenzer.net>
    Signed-off-by: Keith Packard <keithp at keithp.com>
    (cherry picked from commit b557571dbff3d9a615e03cad904d46b8af9153a0)

diff --git a/exa/exa_unaccel.c b/exa/exa_unaccel.c
index b4ead7f..7754502 100644
--- a/exa/exa_unaccel.c
+++ b/exa/exa_unaccel.c
@@ -464,9 +464,11 @@ ExaSrcValidate(DrawablePtr pDrawable,
     REGION_UNION(pScreen, dst, dst, &reg);
     REGION_UNINIT(pScreen, &reg);
 
-    swap(pExaScr, pScreen, SourceValidate);
-    pScreen->SourceValidate(pDrawable, x, y, width, height);
-    swap(pExaScr, pScreen, SourceValidate);
+    if (pExaScr->SourceValidate) {
+        swap(pExaScr, pScreen, SourceValidate);
+        pScreen->SourceValidate(pDrawable, x, y, width, height);
+        swap(pExaScr, pScreen, SourceValidate);
+    }
 }
 
 static Bool