Re: Fw: Rivafb I2C problem, new patch

[Nicolas Boichat <nicolas@boichat.ch>]

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

Hello,

Thanks for your answers.

I attached a new patch: I deleted the lines that were commented out.

Best regards,

Nicolas

On Tue, 2004-07-13 at 03:58, Antonino A. Daplas wrote:
> I'm not the maintainer of rivafb but I added the DDC2 support for it. The bus
> was destroyed because there was no use for it after reading the EDID block,
> and fbdev has no interface (yet) to re-read it again.
> 
> It doesn't matter to me whether the bus is immediately deleted or not, so the
> patch is fine by me.
> 
> Tony 

On Tue, 2004-07-13 at 01:43, Greg KH wrote: 
> Well, you shouldn't comment out those calls, just delete them.
> 
> Other than that, from an i2c standpoint, the patch looks sane, but I
> would check with the maintainer, as there might be some reason they
> delete the bus right after using it.
> 
> thanks,
> 
> greg k-h

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

--- linux/drivers/video/riva/fbdev.c.old	2004-07-13 02:05:47.029754640 +0200
+++ linux/drivers/video/riva/fbdev.c	2004-07-13 02:08:25.945966745 +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,8 @@
 	}
 #endif /* CONFIG_MTRR */
 
+	riva_create_i2c_busses((struct riva_par *) info->par);
+
 	info->fbops = &riva_fb_ops;
 	info->fix = rivafb_fix;
 	riva_get_EDID(info, pd);
@@ -1961,6 +1961,7 @@
 	return 0;
 
 err_out_iounmap_fb:
+	riva_delete_i2c_busses((struct riva_par *) info->par);
 	iounmap(info->screen_base);
 err_out_free_base1:
 	if (default_par->riva.Architecture == NV_ARCH_03) 
@@ -1989,6 +1990,8 @@
 	if (!info)
 		return;
 
+	riva_delete_i2c_busses(par);
+
 	unregister_framebuffer(info);
 #ifdef CONFIG_MTRR
 	if (par->mtrr.vram_valid)