Browse Source

updated xfree86* (4.3.99.903) and fixed my radeon-iBook.patch

git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@2385 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
rocklinux
Rene Rebe 21 years ago
parent
commit
57be24e545
4 changed files with 35 additions and 12 deletions
  1. +3
    -2
      package/x11/xfree86-cyrillic-fonts/xfree86-cyrillic-fonts.desc
  2. +3
    -2
      package/x11/xfree86-doc/xfree86-doc.desc
  3. +26
    -5
      package/x11/xfree86/radeon-iBook.patch
  4. +3
    -3
      package/x11/xfree86/xfree86.desc

+ 3
- 2
package/x11/xfree86-cyrillic-fonts/xfree86-cyrillic-fonts.desc

@ -19,6 +19,7 @@
[COPY] file for details.
[COPY]
[COPY] --- ROCK-COPYRIGHT-NOTE-END ---
[I] Additional XFree86 cyrillic and romanian fonts
[T] Microsoft-CP1251 and Paratype-154 fonts created from the XFree86
@ -34,9 +35,9 @@
[L] OpenSource
[S] Stable
[V] 4.3.99.902
[V] 4.3.99.903
[P] X -----5---9 270.200
[O] mga_version=2.1
[O] xf_files="XFree86-4.3.99.902.tar.bz2"
[O] xf_files="XFree86-4.3.99.903.tar.bz2"

+ 3
- 2
package/x11/xfree86-doc/xfree86-doc.desc

@ -19,6 +19,7 @@
[COPY] file for details.
[COPY]
[COPY] --- ROCK-COPYRIGHT-NOTE-END ---
[I] A full set of XFree86 documentation
[T] In addition to the manual and html pages, XFree86 contains a full set
@ -36,9 +37,9 @@
[L] OpenSource
[S] Stable
[V] 4.3.99.902
[V] 4.3.99.903
[P] O -----5---9 270.100
[O] mga_version=2.1
[O] xf_files="XFree86-4.3.99.902.tar.bz2"
[O] xf_files="XFree86-4.3.99.903.tar.bz2"

+ 26
- 5
package/x11/xfree86/radeon-iBook.patch

@ -20,14 +20,35 @@
On iBook the PLL values for the LCD port are not caluculated correctly - since
I do not have the databook I applied the same hack as present in the BenH
kernel radeon fb ...
kernel radeon fb and added a new default value case ...
- Rene Rebe <rene@rocklinux.org>
diff -ur xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c xc-working/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c
--- xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c 2003-11-21 06:59:08.000000000 +0100
+++ xc-working/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c 2004-02-09 15:57:10.000000000 +0100
@@ -6504,8 +6520,17 @@
--- xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c 2004-02-21 18:25:41.000000000 +0100
+++ xc-working/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c 2004-02-21 18:27:10.000000000 +0100
@@ -1808,6 +1808,11 @@
pll->reference_div = 12;
pll->xclk = 23000;
break;
+ case PCI_CHIP_RADEON_LW: /* Guessed based on iBook Open Firmware data -ReneR */
+ pll->reference_freq = 2700;
+ pll->reference_div = 12;
+ pll->xclk = 36000;
+ break;
default:
pll->reference_freq = 2700;
pll->reference_div = 67;
@@ -6064,7 +6069,7 @@
save->disp_merge_cntl &= ~RADEON_DISP_RGB_OFFSET_EN;
#if X_BYTE_ORDER == X_BIG_ENDIAN
- /* Alhought we current onlu use aperture 0, also setting aperture 1 should not harm -ReneR */
+ /* Alhought we currenty only use aperture 0, setting aperture 1 should not harm. -ReneR */
switch (pScrn->bitsPerPixel) {
case 16:
save->surface_cntl |= RADEON_NONSURF_AP0_SWP_16BPP;
@@ -6507,8 +6512,17 @@
save->feedback_div,
save->post_div));
@ -36,7 +57,7 @@ diff -ur xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c xc-working/p
+
save->ppll_ref_div = pll->reference_div;
save->ppll_div_3 = (save->feedback_div | (post_div->bitvalue << 16));
+#if defined(__powerpc__)
+#if defined(__powerpc__) /* on iBooks the LCD pannel needs tweaked PLL timings -ReneR */
+ ErrorF ("pll_div_3: %d, ", save->ppll_div_3);
+ /* save->ppll_div_3 *= 6; */ /* just a test hack */
+ save->ppll_div_3 = 0x000600ad; /* -ReneR */

+ 3
- 3
package/x11/xfree86/xfree86.desc

@ -38,14 +38,14 @@
[L] OpenSource
[S] Stable
[V] 4.3.99.902
[V] 4.3.99.903
[P] X -----5---9 270.000
[O] mga_version=2.1
#[O] xf_files="X430src-1.tbz2 X430src-2.tbz2 X430src-3.tbz2 X430src-4.tbz2 X430src-5.tbz2 X430src-6.tbz2 X430src-7.tbz2"
#[O] xf_patches="4.3.0-4.3.99.1.diff.bz2 4.3.99.1-4.3.99.2.diff.bz2 4.3.99.2-4.3.99.3.rediff.bz2 4.3.99.3-4.3.99.4.diff.bz2 4.3.99.4-4.3.99.5.diff.bz2 4.3.99.5-4.3.99.6.diff.bz2 4.3.99.6-4.3.99.7.diff.bz2 4.3.99.7-4.3.99.8.diff.bz2"
[O] xf_files="XFree86-4.3.99.902.tar.bz2"
[O] xf_files="XFree86-4.3.99.903.tar.bz2"
#[D] 2694721598 X430src-1.tgz ftp://ftp.xfree86.org/pub/XFree86/4.3.0/source/
#[D] 2898279790 X430src-2.tgz ftp://ftp.xfree86.org/pub/XFree86/4.3.0/source/
@ -55,7 +55,7 @@
#[D] 3179509136 X430src-6.tgz ftp://ftp.xfree86.org/pub/XFree86/4.3.0/source/
#[D] 2504633318 X430src-7.tgz ftp://ftp.xfree86.org/pub/XFree86/4.3.0/source/
[D] 3325729578 XFree86-4.3.99.902.tar.bz2 ftp://ftp.xfree86.org/pub/XFree86/develsnaps/
[D] 0 XFree86-4.3.99.903.tar.bz2 ftp://ftp.xfree86.org/pub/XFree86/develsnaps/
[D] 2803589536 mgadrivers-2.1-src.tgz ftp://ftp.matrox.com/pub/mga/archive/linux/2003/
[D] 4094582231 mangl.tar.Z ftp://ftp.sgi.com/opengl/doc/

Loading…
Cancel
Save