[PATCH] atyfb_base.c requires atyfb_cursor()

[PATCH] atyfb_base.c requires atyfb_cursor()

[Olaf Hering]

atyfb_base.c requires atyfb_cursor, but it is only available for linking
if CONFIG_FB_ATY_CT=y.
This patch moves the .o file to the CONFIG_FB_ATY rule.

Signed-off-by: Olaf Hering <olh@suse.de>

diff -purN linux-2.6.10-rc1-bk9.orig/drivers/video/aty/Makefile linux-2.6.10-rc1-bk9-olh/drivers/video/aty/Makefile
--- linux-2.6.10-rc1-bk9.orig/drivers/video/aty/Makefile	2004-08-14 07:36:44.000000000 +0200
+++ linux-2.6.10-rc1-bk9-olh/drivers/video/aty/Makefile	2004-10-31 21:59:06.965999776 +0100
@@ -2,9 +2,9 @@ obj-$(CONFIG_FB_ATY) += atyfb.o
 obj-$(CONFIG_FB_ATY128) += aty128fb.o
 obj-$(CONFIG_FB_RADEON) += radeonfb.o
 
-atyfb-y				:= atyfb_base.o mach64_accel.o
+atyfb-y				:= atyfb_base.o mach64_accel.o mach64_cursor.o
 atyfb-$(CONFIG_FB_ATY_GX)	+= mach64_gx.o
-atyfb-$(CONFIG_FB_ATY_CT)	+= mach64_ct.o mach64_cursor.o
+atyfb-$(CONFIG_FB_ATY_CT)	+= mach64_ct.o
 atyfb-objs			:= $(atyfb-y)
 
 radeonfb-y			:= radeon_base.o radeon_pm.o radeon_monitor.o radeon_accel.o

-- 
USB is for mice, FireWire is for men!

sUse lINUX ag, nÜRNBERG

[PATCH] set correct mclk/xclk values for aty in ibook

[Olaf Hering]

The first iBook needs special mclk/xclk values, or the screen will show
only garbage. A patch like this went into 2.4.23. It stopped working
after 2.6.10-rc1.

http://linux.bkbits.net:8080/linux-2.4/cset@3f966ca7mqKxZorh7Uw2SBAuVbv3mA

It was discussed here:
http://marc.theaimsgroup.com/?t=106345749200001&r=1&w=4

Signed-off-by: Olaf Hering <olh@suse.de>

diff -purN linux-2.6.10-rc1-bk9.orig/drivers/video/aty/atyfb_base.c linux-2.6.10-rc1-bk9-olh/drivers/video/aty/atyfb_base.c
--- linux-2.6.10-rc1-bk9.orig/drivers/video/aty/atyfb_base.c	2004-10-30 20:13:02.000000000 +0200
+++ linux-2.6.10-rc1-bk9-olh/drivers/video/aty/atyfb_base.c	2004-11-01 16:29:57.613561216 +0100
@@ -2190,6 +2190,14 @@ static int __init aty_init(struct fb_inf
 
 	par->aty_cmap_regs =
 	    (struct aty_cmap_regs __iomem *) (par->ati_regbase + 0xc0);
+#ifdef CONFIG_PPC_PMAC
+	/* The Apple iBook1 uses non-standard memory frequencies. We detect it
+	 * and set the frequency manually. */
+	if (machine_is_compatible("PowerBook2,1")) {
+		par->pll_limits.mclk = 70;
+		par->pll_limits.xclk = 53;
+	}
+#endif
 
 	if (pll)
 		par->pll_limits.pll_max = pll;

-- 
USB is for mice, FireWire is for men!

sUse lINUX ag, nÜRNBERG