[PATCH][2.6-mm] alow user to select old radeonfb driver, and fix compile

["Svetoslav Slavtchev" <svetljo@gmx.de>]

[-- Attachment #1: Type: text/plain, Size: 550 bytes --]

also add the config help from benh tree
and allow building both drivers as modules

the proper way would be 
to mv drivers/video/radeonfb.c to  drivers/video/radeonfb_old.c
but to keep the patch clearer (and smaller) i just added
drivers/video/radeonfb_old.c conaining single line
#include "radeonfb.c"

svetljo

-- 
NEU FÜR ALLE - GMX MediaCenter - für Fotos, Musik, Dateien...
Fotoalbum, File Sharing, MMS, Multimedia-Gruß, GMX FotoService

Jetzt kostenlos anmelden unter http://www.gmx.net

+++ GMX - die erste Adresse für Mail, Message, More! +++

[-- Attachment #2: build_old_radeonfb.patch --]
[-- Type: application/octet-stream, Size: 3594 bytes --]

--- linux-2.6.0-test8/drivers/video/Kconfig	2003-10-21 13:51:19.588019381 +0200
+++ linux-2.6.0-test8/drivers/video/Kconfig	2003-10-21 01:49:31.000000000 +0200
@@ -621,16 +621,40 @@
 	  There is no need for enabling 'Matrox multihead support' if you have
 	  only one Matrox card in the box.
 
+config FB_RADEON_OLD
+	tristate "ATI Radeon display support (Old driver)"
+	depends on FB && PCI
+	help
+	  Choose this option if you want to use an ATI Radeon graphics card as
+	  a framebuffer device.  There are both PCI and AGP versions.  You
+	  don't need to choose this to run the Radeon in plain VGA mode.
+	  There is a product page at
+	  <http://www.ati.com/na/pages/products/pc/radeon32/index.html>.
+
 config FB_RADEON
-	tristate "ATI Radeon display support"
+	tristate "ATI Radeon display support (New driver)"
 	depends on FB && PCI
 	help
 	  Choose this option if you want to use an ATI Radeon graphics card as
 	  a framebuffer device.  There are both PCI and AGP versions.  You
 	  don't need to choose this to run the Radeon in plain VGA mode.
+
+	  If you say Y here and want DDC/I2C support you must first say Y to
+	  "I2C support" and "I2C bit-banging support" in the character devices
+	  section.
+
+	  If you say M here then "I2C support" and "I2C bit-banging support" 
+	  can be build either as modules or built-in.
+
 	  There is a product page at
 	  <http://www.ati.com/na/pages/products/pc/radeon32/index.html>.
 
+config FB_RADEON_I2C
+	bool "DDC/I2C for ATI Radeon support"
+	depends on FB_RADEON && (I2C_ALGOBIT=FB_RADEON || I2C_ALGOBIT=y)
+	help
+	  Say Y here if you want DDC/I2C support for your Radeon board. 
+
 config FB_ATY128
 	tristate "ATI Rage128 display support"
 	depends on FB && PCI
--- linux-2.6.0-test8/drivers/video/Makefile	2003-10-21 13:51:19.596017561 +0200
+++ linux-2.6.0-test8/drivers/video/Makefile	2003-10-21 11:17:22.000000000 +0200
@@ -21,6 +21,7 @@
 obj-$(CONFIG_FB_Q40)              += q40fb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o
 obj-$(CONFIG_FB_ATARI)            += atafb.o
 obj-$(CONFIG_FB_68328)            += 68328fb.o
+obj-$(CONFIG_FB_RADEON_OLD)	  += radeonfb_old.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o
 obj-$(CONFIG_FB_NEOMAGIC)         += neofb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o vgastate.o
 obj-$(CONFIG_FB_IGA)              += igafb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o
 obj-$(CONFIG_FB_CONTROL)          += controlfb.o macmodes.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o
--- linux-2.6.0-test8/drivers/video/radeonfb.c	2003-10-21 13:51:19.615013239 +0200
+++ linux-2.6.0-test8/drivers/video/radeonfb.c	2003-10-21 01:49:31.000000000 +0200
@@ -922,7 +922,7 @@
 		return;
 	}
 
-	tmp = INREG(RADEON_BIOS_4_SCRATCH);
+	tmp = INREG(BIOS_4_SCRATCH);
 	printk(KERN_DEBUG "radeon_get_moninfo: bios 4 scratch = %x\n", tmp);
 	
 	if (rinfo->hasCRTC2) {
@@ -2066,7 +2066,7 @@
 			/* DFP */
 			newmode.fp_gen_cntl |= (FP_FPON | FP_TMDS_EN);
 			newmode.tmds_transmitter_cntl = (TMDS_RAN_PAT_RST |
-							 ICHCSEL | TMDS_PLL_EN) &
+							 TMDS_ICHCSEL | TMDS_PLL_EN) &
 							 ~(TMDS_PLLRST);
 			newmode.crtc_ext_cntl &= ~CRTC_CRT_ON;
 		}
@@ -3031,7 +3031,7 @@
 	pci_set_drvdata(pdev, rinfo);
 	rinfo->next = board_list;
 	board_list = rinfo;
-	rinfo->info.dev = &pdev->dev;
+	rinfo->info.class_dev.dev = &pdev->dev;
 
 	if (register_framebuffer ((struct fb_info *) rinfo) < 0) {
 		printk ("radeonfb: could not register framebuffer\n");
--- /dev/null	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.0-test8/drivers/video/radeonfb_old.c	2003-10-21 11:16:42.000000000 +0200
@@ -0,0 +1 @@
+#include "radeonfb.c"