Re: Compile error in 2.6.8-rc2-mm1 - rivafb related

[Nicolas Boichat]

Hello,


On Fri, 2004-07-30 at 16:14, Adrian Bunk wrote:
> On Thu, Jul 29, 2004 at 02:52:25PM +0200, Grega Fajdiga wrote:
> 
> > Good day,
> 
> Hi Grega,
> 
> > Please CC me, since I'm not subscribed. 
> > I just tried to compile 2.6.8-rc2-mm1 and got this error:
> > drivers/built-in.o(.text+0x7e369): In function `rivafb_probe'::
> > undefined reference to `riva_create_i2c_busses'
> > drivers/built-in.o(.text+0x7e4c1): In function `rivafb_probe'::
> > undefined reference to `riva_delete_i2c_busses'
> > drivers/built-in.o(.exit.text+0x1ca): In function `rivafb_remove'::
> > undefined reference to `riva_delete_i2c_busses'
> > make: *** [.tmp_vmlinux1] Error 1
> >...
> 
> thanks for this report.
> 
> @Nicolas:
> Your rivafb-i2c-fixes patch in -mm causes this with CONFIG_FB_RIVA_I2C=n 
> (it moves i2c code from inside an #ifdef CONFIG_FB_RIVA_I2C to a place 
> where it isn't guarded by such an #ifdef).

It seems that a wrong patch (an older one) has been integrated in -mm.

I attached the right patch, that I already sent on July 14.

Best regards,

Nicolas
From: Nicolas Boichat <nicolas@xxxxxxxxxx>

The I2C busses opened by rivafb were deleted immediately after
reading the EDID, but they should be kept open, so user-space
applications can use them.

They are now deleted when the driver is unloaded.

---

 linux/drivers/video/riva/fbdev.c |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff -puN linux/drivers/video/riva/fbdev.c.old  linux/drivers/video/riva/fbdev.c
--- linux/drivers/video/riva/fbdev.c.old	2004-07-13 02:05:47.000000000 +0200
+++ linux/drivers/video/riva/fbdev.c	2004-07-13 23:34:27.023199272 +0200
@@ -1773,7 +1773,6 @@ static void riva_get_EDID(struct fb_info
 	struct riva_par *par = (struct riva_par *) info->par;
 	int i;
 
-	riva_create_i2c_busses(par);
 	for (i = par->bus; i >= 1; i--) {
 		riva_probe_i2c_connector(par, i, &par->EDID);
 		if (par->EDID) {
@@ -1781,7 +1780,6 @@ static void riva_get_EDID(struct fb_info
 			break;
 		}
 	}
-	riva_delete_i2c_busses(par);
 #endif
 #endif
 }
@@ -1933,6 +1931,10 @@ static int __devinit rivafb_probe(struct
 	}
 #endif /* CONFIG_MTRR */
 
+#ifdef CONFIG_FB_RIVA_I2C
+	riva_create_i2c_busses((struct riva_par *) info->par);
+#endif
+
 	info->fbops = &riva_fb_ops;
 	info->fix = rivafb_fix;
 	riva_get_EDID(info, pd);
@@ -1961,6 +1963,9 @@ static int __devinit rivafb_probe(struct
 	return 0;
 
 err_out_iounmap_fb:
+#ifdef CONFIG_FB_RIVA_I2C
+	riva_delete_i2c_busses((struct riva_par *) info->par);
+#endif
 	iounmap(info->screen_base);
 err_out_free_base1:
 	if (default_par->riva.Architecture == NV_ARCH_03) 
@@ -1989,6 +1994,10 @@ static void __exit rivafb_remove(struct 
 	if (!info)
 		return;
 
+#ifdef CONFIG_FB_RIVA_I2C
+	riva_delete_i2c_busses(par);
+#endif
+
 	unregister_framebuffer(info);
 #ifdef CONFIG_MTRR
 	if (par->mtrr.vram_valid)