Author: dnusinow Date: 2006-02-26 19:41:32 -0500 (Sun, 26 Feb 2006) New Revision: 1338
Added: branches/modular/driver/xf86-video-chips-X11R7.0-1.0.1.3/debian/patches/ branches/modular/driver/xf86-video-chips-X11R7.0-1.0.1.3/debian/patches/01_default_to_noaccel_on_69k.diff branches/modular/driver/xf86-video-chips-X11R7.0-1.0.1.3/debian/patches/02_default_to_swcursor_on_69k.diff branches/modular/driver/xf86-video-chips-X11R7.0-1.0.1.3/debian/patches/series Modified: branches/modular/driver/xf86-video-chips-X11R7.0-1.0.1.3/debian/changelog branches/modular/driver/xf86-video-chips-X11R7.0-1.0.1.3/debian/rules Log: * Port patches from trunk + general/044_chips_default_to_noaccel_on_69k.diff + general/045_chips_default_to_swcursor_on_69k.diff Modified: branches/modular/driver/xf86-video-chips-X11R7.0-1.0.1.3/debian/changelog =================================================================== --- branches/modular/driver/xf86-video-chips-X11R7.0-1.0.1.3/debian/changelog 2006-02-27 00:29:48 UTC (rev 1337) +++ branches/modular/driver/xf86-video-chips-X11R7.0-1.0.1.3/debian/changelog 2006-02-27 00:41:32 UTC (rev 1338) @@ -1,3 +1,11 @@ +xserver-xorg-video-chips (1:1.0.1.3-2) experimental; urgency=low + + * Port patches from trunk + + general/044_chips_default_to_noaccel_on_69k.diff + + general/045_chips_default_to_swcursor_on_69k.diff + + -- David Nusinow <[EMAIL PROTECTED]> Sun, 26 Feb 2006 19:39:59 -0500 + xserver-xorg-video-chips (1:1.0.1.3-1) experimental; urgency=low * First upload to Debian Added: branches/modular/driver/xf86-video-chips-X11R7.0-1.0.1.3/debian/patches/01_default_to_noaccel_on_69k.diff =================================================================== --- branches/modular/driver/xf86-video-chips-X11R7.0-1.0.1.3/debian/patches/01_default_to_noaccel_on_69k.diff 2006-02-27 00:29:48 UTC (rev 1337) +++ branches/modular/driver/xf86-video-chips-X11R7.0-1.0.1.3/debian/patches/01_default_to_noaccel_on_69k.diff 2006-02-27 00:41:32 UTC (rev 1338) @@ -0,0 +1,34 @@ +Index: xf86-video-chips-X11R7.0-1.0.1.3/src/ct_driver.c +=================================================================== +--- xf86-video-chips-X11R7.0-1.0.1.3.orig/src/ct_driver.c 2006-01-12 22:54:18.000000000 -0500 ++++ xf86-video-chips-X11R7.0-1.0.1.3/src/ct_driver.c 2006-02-26 19:37:13.000000000 -0500 +@@ -1496,8 +1496,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_CT69000))) { + cPtr->Flags &= ~ChipsAccelSupport; + xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Acceleration disabled\n"); + } Added: branches/modular/driver/xf86-video-chips-X11R7.0-1.0.1.3/debian/patches/02_default_to_swcursor_on_69k.diff =================================================================== --- branches/modular/driver/xf86-video-chips-X11R7.0-1.0.1.3/debian/patches/02_default_to_swcursor_on_69k.diff 2006-02-27 00:29:48 UTC (rev 1337) +++ branches/modular/driver/xf86-video-chips-X11R7.0-1.0.1.3/debian/patches/02_default_to_swcursor_on_69k.diff 2006-02-27 00:41:32 UTC (rev 1338) @@ -0,0 +1,23 @@ +Index: xf86-video-chips-X11R7.0-1.0.1.3/src/ct_driver.c +=================================================================== +--- xf86-video-chips-X11R7.0-1.0.1.3.orig/src/ct_driver.c 2006-02-26 19:37:13.000000000 -0500 ++++ xf86-video-chips-X11R7.0-1.0.1.3/src/ct_driver.c 2006-02-26 19:37:52.000000000 -0500 +@@ -1529,6 +1529,18 @@ + } else { + cPtr->Accel.UseHWCursor = TRUE; + } ++ /* FIXME: Default to SWcursor on CT65550 as hardware cursor is reported ++ * broken on this chip in Red Hat bugzilla as of XFree86 4.2.99.4: ++ * http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=82438 ++ * Mike A. Harris <[EMAIL PROTECTED]> ++ */ ++ if (cPtr->Chipset == CHIPS_CT65550) { ++ cPtr->Accel.UseHWCursor = FALSE; ++ xf86DrvMsg(pScrn->scrnIndex,X_INFO, ++ "Defaulting to SWcursor as there are known issues with HWcursor on C&T 65550\n" ++ "You can use Option \"HWcursor\" in the X server config file if desired to\n" ++ "force hardware cursors to be used anyway\n"); ++ } + if (xf86GetOptValBool(cPtr->Options, OPTION_HW_CURSOR, + &cPtr->Accel.UseHWCursor)) + from = X_CONFIG; Added: branches/modular/driver/xf86-video-chips-X11R7.0-1.0.1.3/debian/patches/series =================================================================== --- branches/modular/driver/xf86-video-chips-X11R7.0-1.0.1.3/debian/patches/series 2006-02-27 00:29:48 UTC (rev 1337) +++ branches/modular/driver/xf86-video-chips-X11R7.0-1.0.1.3/debian/patches/series 2006-02-27 00:41:32 UTC (rev 1338) @@ -0,0 +1,2 @@ +01_default_to_noaccel_on_69k.diff +02_default_to_swcursor_on_69k.diff Modified: branches/modular/driver/xf86-video-chips-X11R7.0-1.0.1.3/debian/rules =================================================================== --- branches/modular/driver/xf86-video-chips-X11R7.0-1.0.1.3/debian/rules 2006-02-27 00:29:48 UTC (rev 1337) +++ branches/modular/driver/xf86-video-chips-X11R7.0-1.0.1.3/debian/rules 2006-02-27 00:41:32 UTC (rev 1338) @@ -31,7 +31,7 @@ # kbd_drv.a isn't phenomenally useful; kbd_drv.so more so confflags += --disable-static -build: build-stamp +build: patch build-stamp build-stamp: dh_testdir @@ -44,7 +44,7 @@ touch build-stamp -clean: +clean: xsfclean dh_testdir dh_testroot rm -f build-stamp -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
