Full patch below.  This incorporates Dan Christensen's suggested changes,
with relatively florid commentary.


$Id: 044_chips_default_to_noaccel_on_69k.diff 189 2005-06-11 00:04:27Z branden $

This patch by Nathanael Nerode, based on
original patches from Mike A. Harris and Dan Christensen.

Index: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_driver.c
===================================================================
--- xc/programs/Xserver/hw/xfree86/drivers/chips/ct_driver.c    (revision 309)
+++ xc/programs/Xserver/hw/xfree86/drivers/chips/ct_driver.c    (working copy)
@@ -1492,8 +1492,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 <[EMAIL PROTECTED]>
+     *
+     * 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 <[EMAIL PROTECTED]>
+     */
+    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_CT96000))) {
        cPtr->Flags &= ~ChipsAccelSupport;
        xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Acceleration disabled\n");
     }

-- 
Don't say I didn't warn you.


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to