--- XFree86-4.0.2/xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_driver.c.org	Wed Dec  6 19:08:54 2000
+++ XFree86-4.0.2/xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_driver.c	Mon Feb 26 13:37:31 2001
@@ -913,6 +913,13 @@
     else
 	nPtr->Options = (OptionInfoPtr)NEOOptions;
 
+    /* Neomagic 256XL+ needs hardware-cursor disabled by default <hdeller@redhat.com> */
+    if (nPtr->NeoChipset == NM2380) { /* Neomagic 256XL+ */
+	nPtr->swCursor = TRUE;
+	xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
+		       "Neomagic 256XL+ (NM2380) - default to software cursor\n");
+    }
+    
     xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, nPtr->Options);
 
     xf86GetOptValBool(nPtr->Options, OPTION_NOLINEAR_MODE,&nPtr->noLinear);