xserver: Branch 'master'

[Dave Airlie]

 exa/exa_offscreen.c |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 9d684ba0bcab53841a17ebd521507b6df8bc4b45
Author: Dave Airlie <airlied at redhat.com>
Date:   Thu Apr 16 10:28:36 2009 +1000

    exa: avoid offscreen pixmap swapped out flag for driver pixmaps

diff --git a/exa/exa_offscreen.c b/exa/exa_offscreen.c
index 4aaa2c1..d7198cb 100644
--- a/exa/exa_offscreen.c
+++ b/exa/exa_offscreen.c
@@ -371,6 +371,9 @@ exaEnableDisableFBAccess (int index, Bool enable)
     ScreenPtr pScreen = screenInfo.screens[index];
     ExaScreenPriv (pScreen);
 
+    if (pExaScr->info->flags & EXA_HANDLES_PIXMAPS)
+	return;
+
     if (!enable && pExaScr->disableFbCount++ == 0) {
 	if (pExaScr->info->exa_minor < 1)
 	    ExaOffscreenSwapOut (pScreen);