Re: Fw: Rivafb I2C problem, new patch

[Nicolas Boichat <nicolas@boichat.ch>]

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

Hello,

Good idea... it didn't compile. Fixed patch attached.

Best regards,

Nicolas

On Tue, 2004-07-13 at 22:52, Antonino A. Daplas wrote:
> On Tuesday 13 July 2004 17:53, Nicolas Boichat wrote:
> > Hello,
> >
> > Thanks for your answers.
> >
> > I attached a new patch: I deleted the lines that were commented out.
> >
> 
> One thing I forgot, make sure it compiles when CONFIG_FB_RIVA_I2C is
> set or not.
> 
> Tony
> 
> 
> 

[-- Attachment #2: Type: text/x-patch, Size: 1099 bytes --]

--- fbdev.c.old	2004-07-13 02:05:47.000000000 +0200
+++ fbdev.c	2004-07-13 23:34:27.023199272 +0200
@@ -1773,7 +1773,6 @@
 	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 @@
 			break;
 		}
 	}
-	riva_delete_i2c_busses(par);
 #endif
 #endif
 }
@@ -1933,6 +1931,10 @@
 	}
 #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 @@
 	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 @@
 	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)