47. Disable Mach64 hardware cursors when the unaccelerated VGA CRTC is used

      to produce server-generated video modes (Marc La France).
  46. Fix Mach64 video memory burst transfers on x86_64 (Marc La France).

3 files changed, 11 insertions, 7 deletions

diff --git a/programs/Xserver/hw/xfree86/CHANGELOG b/programs/Xserver/hw/xfree86/CHANGELOG
index 26f551b0f..eb217eb96 100644
--- a/programs/Xserver/hw/xfree86/CHANGELOG
+++ b/programs/Xserver/hw/xfree86/CHANGELOG
@@ -1,4 +1,7 @@
 XFree86 4.7.99.17 (xx May 2008)
+  47. Disable Mach64 hardware cursors when the unaccelerated VGA CRTC is used
+      to produce server-generated video modes (Marc La France).
+  46. Fix Mach64 video memory burst transfers on x86_64 (Marc La France).
   45. Remove two unused functions from xf4bpp (Miod Vallat, Marc La France).
   44. Fix additional incorrect assumptions regarding unassigned PCI resources
       (Marc La France).
@@ -20738,4 +20741,4 @@ XFree86 3.0a (28 April 1994)
 XFree86 3.0 (26 April 1994)
 
 
-$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.3955 2008/05/01 17:11:30 tsi Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.3956 2008/05/02 15:09:09 tsi Exp $
diff --git a/programs/Xserver/hw/xfree86/drivers/ati/atimach64io.h b/programs/Xserver/hw/xfree86/drivers/ati/atimach64io.h
index 5bd0566e2..b142d0e55 100644
--- a/programs/Xserver/hw/xfree86/drivers/ati/atimach64io.h
+++ b/programs/Xserver/hw/xfree86/drivers/ati/atimach64io.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atimach64io.h,v 1.21tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atimach64io.h,v 1.22tsi Exp $ */
 /*
  * Copyright 2000 through 2008 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org
  *
@@ -303,7 +303,7 @@ extern void ATIMach64AccessTVReg  FunctionPrototype((ATIPtr, const CARD8));
 #define ATIMove32(_pDst, _pSrc, _nCount) \
     do                                   \
     {                                    \
-        long d0, d1, d2;                 \
+        int d0, d1, d2;                  \
         __asm__ __volatile__             \
         (                                \
             "cld\n\t"                    \
diff --git a/programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c b/programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c
index 138cf8e72..51fafacef 100644
--- a/programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c
+++ b/programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c,v 1.94 2008/01/01 00:40:01 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c,v 1.95tsi Exp $ */
 /*
  * Copyright 1999 through 2008 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org
  *
@@ -2416,7 +2416,8 @@ ATIPreInit
 
                 ServerVideoRAM = pATI->VideoRAM;
 
-                if (pATI->Cursor > ATI_CURSOR_SOFTWARE)
+                if ((pATI->Cursor > ATI_CURSOR_SOFTWARE) &&
+                    (pATI->NewHW.crtc == ATI_CRTC_MACH64))
                 {
                     /*
                      * Allocate a 1 kB cursor image area at the top of the
@@ -2639,8 +2640,8 @@ ATIPreInit
     if ((pATI->Cursor > ATI_CURSOR_SOFTWARE) && !pATI->CursorBase)
     {
         xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING,
-            "Unable to store hardware cursor image.  Reverting to software"
-            " cursor.\n");
+            "Hardware cursor not supported in this configuration.  Reverting"
+            " to software cursor.\n");
         pATI->Cursor = ATI_CURSOR_SOFTWARE;
     }