rpms/xorg-x11/devel xorg-x11-6.8.2-ati-radeon-ppc-enable-dynamic-clocks.patch, 1.1, 1.2

[fedora-cvs-commits at redhat.com]

Author: mharris

Update of /cvs/dist/rpms/xorg-x11/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2490

Modified Files:
	xorg-x11-6.8.2-ati-radeon-ppc-enable-dynamic-clocks.patch 
Log Message:
Update xorg-x11-6.8.2-ati-radeon-ppc-enable-dynamic-clocks.patch with new patch from dwmw2

xorg-x11-6.8.2-ati-radeon-ppc-enable-dynamic-clocks.patch:
 radeon.man      |    5 ++++-
 radeon_driver.c |    4 ++++
 2 files changed, 8 insertions(+), 1 deletion(-)

Index: xorg-x11-6.8.2-ati-radeon-ppc-enable-dynamic-clocks.patch
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11/devel/xorg-x11-6.8.2-ati-radeon-ppc-enable-dynamic-clocks.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xorg-x11-6.8.2-ati-radeon-ppc-enable-dynamic-clocks.patch	16 May 2005 22:09:36 -0000	1.1
+++ xorg-x11-6.8.2-ati-radeon-ppc-enable-dynamic-clocks.patch	22 Sep 2005 19:56:12 -0000	1.2
@@ -9,20 +9,6 @@
 
 Kristian Høgsberg <krh at redhat.com>
 
---- xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c.xorg-x11-6.8.2-ati-radeon-ppc-enable-dynamic-clocks	2005-05-16 17:58:52.000000000 -0400
-+++ xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c	2005-05-16 18:02:46.000000000 -0400
-@@ -208,7 +208,11 @@
-     { OPTION_SUBPIXEL_ORDER, "SubPixelOrder",    OPTV_ANYSTR,  {0}, FALSE },
- #endif
-     { OPTION_SHOWCACHE,      "ShowCache",        OPTV_BOOLEAN, {0}, FALSE },
-+#ifdef __powerpc__
-+    { OPTION_DYNAMIC_CLOCKS, "DynamicClocks",    OPTV_BOOLEAN, {0}, TRUE  },
-+#else
-     { OPTION_DYNAMIC_CLOCKS, "DynamicClocks",    OPTV_BOOLEAN, {0}, FALSE },
-+#endif
-     { -1,                    NULL,               OPTV_NONE,    {0}, FALSE }
- };
- 
 --- xc/programs/Xserver/hw/xfree86/drivers/ati/radeon.man.xorg-x11-6.8.2-ati-radeon-ppc-enable-dynamic-clocks	2005-05-16 17:58:52.000000000 -0400
 +++ xc/programs/Xserver/hw/xfree86/drivers/ati/radeon.man	2005-05-16 17:58:52.000000000 -0400
 @@ -492,7 +492,10 @@
@@ -37,3 +23,17 @@
  .TP
  
  .SH SEE ALSO
+--- xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c~	2005-05-23 13:05:46.000000000 +0100
++++ xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c	2005-05-23 13:14:44.000000000 +0100
+@@ -4521,7 +4520,11 @@ Bool RADEONScreenInit(int scrnIndex, Scr
+     RADEONSave(pScrn);
+ 
+     if ((!info->IsSecondary)) {
++#ifdef __powerpc__
++        if (xf86ReturnOptValBool(info->Options, OPTION_DYNAMIC_CLOCKS, TRUE)) {
++#else
+         if (xf86ReturnOptValBool(info->Options, OPTION_DYNAMIC_CLOCKS, FALSE)) {
++#endif
+ 	    RADEONSetDynamicClock(pScrn, 1);
+         } else {
+ 	    RADEONSetDynamicClock(pScrn, 0);