[Linux-fbdev-devel] [PATCH] i810fb: make probe of DDC3 optional

[Manuel L. <ma...@ro...>]

Some time before 2.6.15, a third DDC channel was added to i810fb.
On systems where these ddc pins are not connected, the probe
takes about 10 seconds.

Introduce a config option to disable the probe on ddc channel 3.
Reduces boot time on my i815 laptop by 10 seconds.


diff -Naurp linux-2.6.15/drivers/video/Kconfig linux-2.6.15-b/drivers/video/Kconfig
--- linux-2.6.15/drivers/video/Kconfig	2006-01-03 04:21:10.000000000 +0100
+++ linux-2.6.15-b/drivers/video/Kconfig	2006-01-25 08:02:54.772567000 +0100
@@ -728,6 +728,16 @@ config FB_I810_I2C
 	select I2C_ALGOBIT
 	help
 
+config FB_I810_I2C_NODDC3
+	bool "Disable probing on DDC3"
+	depends on FB_I810_I2C
+	default y
+	help
+	  Select this if you want to skip the probe of DDC3. On I810 where
+	  the DDC3 pins are not connected, probing will take a very long time,
+	  enabling this option will skip this probe altogether, shortening
+	  boot/module-load time by about 10 seconds.
+
 config FB_INTEL
 	tristate "Intel 830M/845G/852GM/855GM/865G support (EXPERIMENTAL)"
 	depends on FB && EXPERIMENTAL && PCI && X86_32
diff -Naurp linux-2.6.15/drivers/video/i810/i810-i2c.c linux-2.6.15-b/drivers/video/i810/i810-i2c.c
--- linux-2.6.15/drivers/video/i810/i810-i2c.c	2006-01-03 04:21:10.000000000 +0100
+++ linux-2.6.15-b/drivers/video/i810/i810-i2c.c	2006-01-25 08:00:20.822567000 +0100
@@ -190,6 +190,11 @@ int i810_probe_i2c_connector(struct fb_i
         u8 *edid = NULL;
         int i;
 
+#ifdef CONFIG_FB_I810_I2C_NODDC3
+	if (conn == 3)
+		return 1;
+#endif
+
 	DPRINTK("i810-i2c: Probe DDC%i Bus\n", conn);
 	if (conn < 4) {
 		for (i = 0; i < 3; i++) {