X Strike Force XFree86 SVN commit: r1238 - in trunk/debian: . patches
Author: branden
Date: 2004-04-11 22:59:18 -0500 (Sun, 11 Apr 2004)
New Revision: 1238
Added:
trunk/debian/patches/083_siliconmotion_rotate_option_disables_randr.diff
Modified:
trunk/debian/TODO
trunk/debian/changelog
Log:
Disable RandR extension support in siliconmotion driver when the driver's
"Rotate" option is used (thanks, Jim Paris). (Closes: #241286)
Remove TODO item.
Modified: trunk/debian/TODO
===================================================================
--- trunk/debian/TODO 2004-04-12 03:35:30 UTC (rev 1237)
+++ trunk/debian/TODO 2004-04-12 03:59:18 UTC (rev 1238)
@@ -83,8 +83,6 @@
* Make xserver-xfree86.config.in bail with a message if the config files we'll
be asking questions about have been diddled.
* #242209: xlibs: re-implement "grp:sclk_toggle" option
-* #241286: xserver-xfree86: [siliconmotion] Rotate option broken when RandR
- extension active; apply patch from Jim Paris
Probably for 4.4.0
==================
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-04-12 03:35:30 UTC (rev 1237)
+++ trunk/debian/changelog 2004-04-12 03:59:18 UTC (rev 1238)
@@ -158,8 +158,11 @@
extension to initialize a Mesa context; patch by Ferris McCormick,
backported from XFree86 CVS by Christian Guggenberger. (Closes: #241331)
- -- Branden Robinson <branden@debian.org> Sun, 11 Apr 2004 22:31:25 -0500
+ * Disable RandR extension support in siliconmotion driver when the driver's
+ "Rotate" option is used (thanks, Jim Paris). (Closes: #241286)
+ -- Branden Robinson <branden@debian.org> Sun, 11 Apr 2004 22:57:26 -0500
+
xfree86 (4.3.0-7) unstable; urgency=medium
* Urgency due to fix for FTBFS. Yes -- I too am begging for it to stop.
Added: trunk/debian/patches/083_siliconmotion_rotate_option_disables_randr.diff
===================================================================
--- trunk/debian/patches/083_siliconmotion_rotate_option_disables_randr.diff 2004-04-12 03:35:30 UTC (rev 1237)
+++ trunk/debian/patches/083_siliconmotion_rotate_option_disables_randr.diff 2004-04-12 03:59:18 UTC (rev 1238)
@@ -0,0 +1,31 @@
+$Id$
+
+Framebuffer rotation with shadowfb and the RandR extension do not get along
+together. When the siliconmotion driver's "Rotate" option is used, disable
+RandR support. See Debian #241286.
+
+This patch by Jim Paris.
+
+Not submitted upstream.
+
+--- xc/programs/Xserver/hw/xfree86/drivers/siliconmotion/smi_driver.c 2003-02-05 12:45:29.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/drivers/siliconmotion/smi_driver.c 2004-03-30 18:51:20.000000000 -0500
+@@ -2156,6 +2156,7 @@
+ pSmi->PointerMoved = pScrn->PointerMoved;
+ pScrn->PointerMoved = SMI_PointerMoved;
+ }
++ xf86DisableRandR();
+ }
+
+ ShadowFBInit(pScreen, refreshArea);
+--- xc/programs/Xserver/hw/xfree86/drivers/siliconmotion/siliconmotion.man~ 2004-04-11 22:44:01.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/drivers/siliconmotion/siliconmotion.man 2004-04-11 22:45:10.000000000 -0500
+@@ -87,7 +87,7 @@
+ .TP
+ .BI "Option \*qRotate\*q \*qCCW\*q"
+ Rotate the screen CW - clockwise or CCW - counter clockwise.
+-Uses ShadowFB. Default: no rotation.
++Uses ShadowFB and disables RandR extension. Default: no rotation.
+ .TP
+ .BI "Option \*qVideoKey\*q \*q" integer \*q
+ Set the video color key. Default: a little off full blue.
Property changes on: trunk/debian/patches/083_siliconmotion_rotate_option_disables_randr.diff
___________________________________________________________________
Name: svn:keywords
+ Id
Reply to: