From 14ed0c3d6d674df4edcbcd8840a7cea4b41a0673 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Wed, 30 May 2001 15:36:25 +0000
Subject: [PATCH] Fix kaa to not try Copy for pixmap sources

---
 hw/kdrive/src/kaa.c             | 5 +++--
 hw/kdrive/trident/tridentdraw.c | 6 ++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/hw/kdrive/src/kaa.c b/hw/kdrive/src/kaa.c
index 0dd51986e..da9d89284 100644
--- a/hw/kdrive/src/kaa.c
+++ b/hw/kdrive/src/kaa.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86$
+ * $XFree86: xc/programs/Xserver/hw/kdrive/kaa.c,v 1.1 2001/05/29 04:54:10 keithp Exp $
  *
  * Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc.
  *
@@ -127,7 +127,8 @@ kaaCopyNtoN (DrawablePtr    pSrcDrawable,
     CARD32  cmd;
     CARD8   alu;
     
-    if ((*pKaaScr->PrepareCopy) (pSrcDrawable,
+    if (pSrcDrawable->type == DRAWABLE_WINDOW &&
+	(*pKaaScr->PrepareCopy) (pSrcDrawable,
 				 pDstDrawable,
 				 upsidedown,
 				 reverse,
diff --git a/hw/kdrive/trident/tridentdraw.c b/hw/kdrive/trident/tridentdraw.c
index 0d28dd14b..486bad693 100644
--- a/hw/kdrive/trident/tridentdraw.c
+++ b/hw/kdrive/trident/tridentdraw.c
@@ -21,7 +21,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/hw/kdrive/trident/tridentdraw.c,v 1.6 2000/10/11 06:04:40 keithp Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/kdrive/trident/tridentdraw.c,v 1.8 2001/05/29 04:54:12 keithp Exp $ */
 
 #include "trident.h"
 #include "tridentdraw.h"
@@ -119,9 +119,7 @@ tridentPrepareCopy (DrawablePtr	pSrcDrawable,
 {
     FbBits	    depthMask;
     
-    if ((pm & depthMask) == depthMask &&
-	pSrcDrawable->type == DRAWABLE_WINDOW &&
-	pDstDrawable->type == DRAWABLE_WINDOW)
+    if ((pm & depthMask) == depthMask)
     {
 	KdScreenPriv(pDstDrawable->pScreen);
 	tridentCardInfo(pScreenPriv);