--- xserver-xorg-video-chips.orig/src/ct_driver.c
+++ xserver-xorg-video-chips/src/ct_driver.c
@@ -1606,8 +1606,28 @@
 			   "rgb bits %d\n", val);
 	}
     }
+    /* FIXME: Disable 2D acceleration on C&T 69000 by default, since it is
+     * reported to be broken, but nobody who has this hardware has narrowed
+     * it down to individual acceleration primitives yet.  This is a Red Hat
+     * workaround for a bug reported in bugzilla at:
+     * https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=74841
+     * Mike A. Harris <mharris@redhat.com>
+     *
+     * However, it works for some people, so allow them to turn it on
+     * in the config file.  Just change the *default*.
+     * Thanks to Dan Christensen <jdc@uwo.ca>
+     */
+    if (cPtr->Chipset == CHIPS_CT69000 && (cPtr->Flags & ChipsAccelSupport) ) {
+	xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+	    "Acceleration is disabled by default on C&T 69000 as it has been reported\n"
+	    "to be broken: https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=74841\n"
+	    "You can turn it on by adding Option \"NoAccel\" \"false\" to the Screen\n"
+	    "section of your xorg.conf file\n" );
+    }
+
     if ((cPtr->Flags & ChipsAccelSupport) &&
-	(xf86ReturnOptValBool(cPtr->Options, OPTION_NOACCEL, FALSE))) {
+	(xf86ReturnOptValBool(cPtr->Options, OPTION_NOACCEL,
+			      cPtr->Chipset == CHIPS_CT69000))) {
 	cPtr->Flags &= ~ChipsAccelSupport;
 	xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Acceleration disabled\n");
     }