X Strike Force XFree86 SVN commit: r1732 - in trunk/debian: . patches
Author: branden
Date: 2004-08-12 16:22:41 -0500 (Thu, 12 Aug 2004)
New Revision: 1732
Added:
trunk/debian/patches/099f_savage_driver_disable_randr_on_rotation.diff
Modified:
trunk/debian/CHANGESETS
trunk/debian/TODO
trunk/debian/changelog
trunk/debian/patches/911_debian_XF86Config_to_XF86Config-4.diff
Log:
Apply patch to savage driver to turn off RandR extension when driver's
"Rotate" option is used, preventing screen garbling (patch #099f; thanks,
Jorg Schuler). Update manpage to document this fact. Resync patch #911.
(Closes: #258986)
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2004-08-12 08:29:56 UTC (rev 1731)
+++ trunk/debian/CHANGESETS 2004-08-12 21:22:41 UTC (rev 1732)
@@ -352,4 +352,10 @@
- sv_SE.ISO-8859-15 is supported. (Closes: #243237)
1731
+Apply patch to savage driver to turn off RandR extension when driver's
+"Rotate" option is used, preventing screen garbling (patch #099f; thanks,
+Jorg Schuler). Update manpage to document this fact. Resync patch #911.
+(Closes: #258986)
+ 1732
+
vim:set ai et sts=4 sw=4 tw=80:
Modified: trunk/debian/TODO
===================================================================
--- trunk/debian/TODO 2004-08-12 08:29:56 UTC (rev 1731)
+++ trunk/debian/TODO 2004-08-12 21:22:41 UTC (rev 1732)
@@ -61,9 +61,6 @@
+ #261777: Problems handling multiple detected video cards; see what can be
done about this [BR]
* Add FAQ entry describing Debian's plans in the X department.
-* #258986: turn off RandR support in savage driver when driver's "Rotate" option
- is used; patch for driver supplied by submitter; need to write update to
- manpage documenting this (see patch #083).
* #252274: fix bad comment character in Debian's mods to XTerm's app-defaults
file
* #256706: keep swatting away at the keyboard modifer issue; Ivan Pascal told
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-08-12 08:29:56 UTC (rev 1731)
+++ trunk/debian/changelog 2004-08-12 21:22:41 UTC (rev 1732)
@@ -267,6 +267,11 @@
- et_EE.ISO-8859-15 is supported. (Closes: #258223)
- sv_SE.ISO-8859-15 is supported. (Closes: #243237)
+ * Apply patch to savage driver to turn off RandR extension when driver's
+ "Rotate" option is used, preventing screen garbling (patch #099f; thanks,
+ Jorg Schuler). Update manpage to document this fact. Resync patch #911.
+ (Closes: #258986)
+
Changes by Fabio M. Di Nitto and Branden Robinson:
* Support building only the parts of the source tree needed by
@@ -308,7 +313,7 @@
autodetection would cause the script to think it had detected one X server
or XFree86 video driver instead ($(echo "" | wc -l) is "1", not "0").
- -- Branden Robinson <branden@debian.org> Thu, 12 Aug 2004 02:45:45 -0500
+ -- Branden Robinson <branden@debian.org> Thu, 12 Aug 2004 16:16:21 -0500
xfree86 (4.3.0.dfsg.1-6) unstable; urgency=low
Added: trunk/debian/patches/099f_savage_driver_disable_randr_on_rotation.diff
===================================================================
--- trunk/debian/patches/099f_savage_driver_disable_randr_on_rotation.diff 2004-08-12 08:29:56 UTC (rev 1731)
+++ trunk/debian/patches/099f_savage_driver_disable_randr_on_rotation.diff 2004-08-12 21:22:41 UTC (rev 1732)
@@ -0,0 +1,65 @@
+$Id$
+
+Turn off RandR extension when using the driver's rotation feature, just as
+the smi driver does.
+
+Driver patch by Jorg Schuler; manpage update by Branden Robinson, which
+also "undocuments" reference to nonexistent shadowfb manpage.
+
+Not submitted to XFree86.
+
+diff -urN xc/programs/Xserver/hw/xfree86/drivers/savage~/savage.man xc/programs/Xserver/hw/xfree86/drivers/savage/savage.man
+--- xc/programs/Xserver/hw/xfree86/drivers/savage~/savage.man 2004-08-12 02:44:24.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/drivers/savage/savage.man 2004-08-12 03:37:10.000000000 -0500
+@@ -76,14 +76,18 @@
+ .BI "Option \*qRotate\*q \*qCW\*q"
+ .TP
+ .BI "Option \*qRotate\*q \*qCCW\*q"
+-Rotate the desktop 90 degrees clockwise or counterclockwise. This option
+-forces the ShadowFB option on, and disables acceleration.
++Rotate the desktop 90 degrees clockwise or counterclockwise.
++This option forces the ShadowFB option on, and disables acceleration and
++the RandR extension.
+ Default: no rotation.
+ .TP
+ .BI "Option \*qShadowFB\*q \*q" boolean \*q
+-Enable or disable use of the shadow framebuffer layer. See
+-shadowfb(__drivermansuffix__) for further information. This option
+-disables acceleration. Default: off.
++Enable or disable use of the shadow framebuffer layer.
++.\" See
++.\" .BR shadowfb (__drivermansuffix__)
++.\" for further information.
++This option disables acceleration.
++Default: off.
+ .TP
+ .BI "Option \*qLCDClock\*q \*q" frequency \*q
+ Override the maximum dot clock. Some LCD panels produce incorrect results if
+diff -urN xc/programs/Xserver/hw/xfree86/drivers/savage~/savage_driver.c xc/programs/Xserver/hw/xfree86/drivers/savage/savage_driver.c
+--- xc/programs/Xserver/hw/xfree86/drivers/savage~/savage_driver.c 2004-08-12 02:44:15.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/drivers/savage/savage_driver.c 2004-08-12 03:34:09.000000000 -0500
+@@ -833,15 +833,21 @@
+ if ((s = xf86GetOptValString(psav->Options, OPTION_ROTATE))) {
+ if(!xf86NameCmp(s, "CW")) {
+ /* accel is disabled below for shadowFB */
++ /* RandR is disabled when the Rotate option is used (does
++ * not work well together and scrambles the screen) */
+ psav->shadowFB = TRUE;
+ psav->rotate = 1;
++ xf86DisableRandR();
+ xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
+- "Rotating screen clockwise - acceleration disabled\n");
++ "Rotating screen clockwise"
++ " - acceleration and RandR disabled\n");
+ } else if(!xf86NameCmp(s, "CCW")) {
+ psav->shadowFB = TRUE;
+ psav->rotate = -1;
+- xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Rotating screen"
+- "counter clockwise - acceleration disabled\n");
++ xf86DisableRandR();
++ xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
++ "Rotating screen counter clockwise"
++ " - acceleration and RandR disabled\n");
+ } else {
+ xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "\"%s\" is not a valid"
+ "value for Option \"Rotate\"\n", s);
Property changes on: trunk/debian/patches/099f_savage_driver_disable_randr_on_rotation.diff
___________________________________________________________________
Name: svn:keywords
+ id
Modified: trunk/debian/patches/911_debian_XF86Config_to_XF86Config-4.diff
===================================================================
--- trunk/debian/patches/911_debian_XF86Config_to_XF86Config-4.diff 2004-08-12 08:29:56 UTC (rev 1731)
+++ trunk/debian/patches/911_debian_XF86Config_to_XF86Config-4.diff 2004-08-12 21:22:41 UTC (rev 1732)
@@ -704,9 +704,8 @@
.SH KNOWN BUGS
The VideoRam generic driver parameter is presently ignored by the
-diff -urN xc/programs/Xserver/hw/xfree86~/drivers/savage/savage.man xc/programs/Xserver/hw/xfree86/drivers/savage/savage.man
---- xc/programs/Xserver/hw/xfree86~/drivers/savage/savage.man 2004-08-10 17:18:39.000000000 -0500
-+++ xc/programs/Xserver/hw/xfree86/drivers/savage/savage.man 2004-08-10 17:19:26.000000000 -0500
+--- xc/programs/Xserver/hw/xfree86/drivers/savage/savage.man~ 2004-08-12 03:45:09.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/drivers/savage/savage.man 2004-08-12 03:45:24.000000000 -0500
@@ -51,7 +51,7 @@
.B ProSavage DDR-K
(8d04)
@@ -716,7 +715,7 @@
details. This section only covers configuration details specific to this
driver.
.PP
-@@ -120,7 +120,7 @@
+@@ -124,7 +124,7 @@
.SH FILES
savage_drv.o
.SH "SEE ALSO"
Reply to: