X Strike Force X.Org X11 SVN commit: r206 - trunk/debian/patches
Author: branden
Date: 2005-06-14 03:53:26 -0500 (Tue, 14 Jun 2005)
New Revision: 206
Removed:
trunk/debian/patches/025_radeon_unblank_fp2_on_start.diff
Modified:
trunk/debian/patches/0000_backport_from_upstream.diff
Log:
Drop the mysterious patch #025 from Ubuntu with no providence and no
explanation of its purpose in favor of an identical fix from upstream CVS
which actually has these things.
Modified: trunk/debian/patches/0000_backport_from_upstream.diff
===================================================================
--- trunk/debian/patches/0000_backport_from_upstream.diff 2005-06-14 08:26:23 UTC (rev 205)
+++ trunk/debian/patches/0000_backport_from_upstream.diff 2005-06-14 08:53:26 UTC (rev 206)
@@ -13,6 +13,16 @@
writing (2005-06-14), there have been no commits to XORG-6_8-branch since
X.Org 6.8.2 was released.
+2004-10-11 Egbert Eich <eich-at-freedesktop-org>
+
+[...]
+ * programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c:
+ (RADEONInitCrtc2Registers):
+ Unblank secondary screen explicitely. Don't rely on the value
+ read during register save as the BIOS have blanked the secondary
+ head.
+[...]
+
2004-11-07 Fabio M. Di Nitto <fabbione@fabbione.net>
* programs/Xserver/hw/dmx/config/Imakefile
@@ -77,6 +87,22 @@
* config/cf/linux.cf:
Fix typo that I introduced on 2005-03-06.
+Index: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c
+===================================================================
+RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c,v
+retrieving revision 1.21
+retrieving revision 1.22
+diff -u -r1.21 -r1.22
+--- xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c 3 Oct 2004 00:01:14 -0000 1.21
++++ xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c 11 Oct 2004 09:58:04 -0000 1.22
+@@ -6482,6 +6482,7 @@
+ save->fp2_h_sync_strt_wid = save->crtc2_h_sync_strt_wid;
+ save->fp2_v_sync_strt_wid = save->crtc2_v_sync_strt_wid;
+ save->fp2_gen_cntl = info->SavedReg.fp2_gen_cntl | RADEON_FP2_ON;
++ save->fp2_gen_cntl &= ~(RADEON_FP2_BLANK_EN);
+
+ if (info->ChipFamily == CHIP_FAMILY_R200 ||
+ IS_R300_VARIANT) {
Index: xc/programs/Xserver/hw/dmx/config/Imakefile
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/dmx/config/Imakefile,v
Deleted: trunk/debian/patches/025_radeon_unblank_fp2_on_start.diff
===================================================================
--- trunk/debian/patches/025_radeon_unblank_fp2_on_start.diff 2005-06-14 08:26:23 UTC (rev 205)
+++ trunk/debian/patches/025_radeon_unblank_fp2_on_start.diff 2005-06-14 08:53:26 UTC (rev 206)
@@ -1,12 +0,0 @@
-$Id$
-
---- xc/programs/Xserver/hw/xfree86/drivers/ati.orig/radeon_driver.c 2005-02-18 21:36:15.048813608 +1100
-+++ xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c 2005-02-18 21:36:48.086791072 +1100
-@@ -6730,6 +6730,7 @@
- save->fp2_h_sync_strt_wid = save->crtc2_h_sync_strt_wid;
- save->fp2_v_sync_strt_wid = save->crtc2_v_sync_strt_wid;
- save->fp2_gen_cntl = info->SavedReg.fp2_gen_cntl | RADEON_FP2_ON;
-+ save->fp2_gen_cntl &= ~(RADEON_FP2_BLANK_EN);
-
- if (info->ChipFamily == CHIP_FAMILY_R200 ||
- IS_R300_VARIANT) {
Reply to: