2.6.14-rc4-mm1
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 9 lines · Andrew Morton
Wanna send fix please?
Begin forwarded message:
Date: Mon, 17 Oct 2005 15:07:15 +0800
From: WU Fengguang <[email protected]>
To: Andrew Morton <[email protected]>
Cc: [email protected]
Subject: Re: 2.6.14-rc4-mm1
Does that updated patch fixes it ?
drivers/video/Kconfig +1 -1
@@ -662,7 +662,7 @@ config FB_NVIDIA_I2C bool "Enable DDC Support" - depends on FB_NVIDIA && !PPC_OF + depends on FB_NVIDIA help This enables I2C support for nVidia Chipsets. This is used only for getting EDID information from the attached display
drivers/video/nvidia/nv_of.c +45 -19
79 lines not on this page · raw message
drivers/video/nvidia/nv_proto.h +9 -5
@@ -31,7 +31,7 @@void NVLockUnlock (struct nvidia_par *par,int );/* in nvidia-i2c.c */ -#if defined(CONFIG_FB_NVIDIA_I2C ) || defined (CONFIG_PPC_OF ) +#ifdef CONFIG_FB_NVIDIA_I2C void nvidia_create_i2c_busses (struct nvidia_par *par);void nvidia_delete_i2c_busses (struct nvidia_par *par); int nvidia_probe_i2c_connector(struct fb_info *info, int conn,
@@ -39,10 +39,14 @@#else #define nvidia_create_i2c_busses (...)#define nvidia_delete_i2c_busses (...) -#define nvidia_probe_i2c_connector (p, c, edid) \ -do { \ - *(edid) = NULL; \ -} while(0) +#define nvidia_probe_i2c_connector (p, c, edid) (-1) +#endif + +#ifdef CONFIG_FB_OF +int nvidia_probe_of_connector (struct fb_info *info,int conn, +u8 ** out_edid); +#else +#define nvidia_probe_of_connector (p, c, edid) (-1)#endif /* in nv_accel.c */
drivers/video/nvidia/nv_setup.c +11 -5
@@ -190,9 +190,9 @@ present = (NV_RD32 (PRAMDAC ,0x0608 ) & (1 <<28 )) ?1 :0 ;if (present) -printk ("nvidiafb: CRTC%i found\n" , output); +printk ("nvidiafb: CRTC%i analog found\n" , output);else -printk ("nvidiafb: CRTC%i not found\n" , output); +printk ("nvidiafb: CRTC%i analog not found\n" , output);NV_WR32 (par->PRAMDAC0,0x0608 ,NV_RD32 (par->PRAMDAC0,0x0608 ) &0x0000EFFF );
@@ -305,6 +305,9 @@int FlatPanel =-1 ;/* really means the CRTC is slaved */ int Television =0 ; +memset (&monitorA,0 ,sizeof (struct fb_monspecs )); +memset (&monitorB,0 ,sizeof (struct fb_monspecs )); + par->PRAMIN = par->REGS + (0x00710000 /4 ); par->PCRTC0 = par->REGS + (0x00600000 /4 ); par->PRAMDAC0 = par->REGS + (0x00680000 /4 );
@@ -401,7 +404,8 @@nvidia_create_i2c_busses (par);if (!par->twoHeads) { par->CRTCnumber =0 ; -nvidia_probe_i2c_connector (info,1 , &edidA); +if (nvidia_probe_i2c_connector (info,1 , &edidA)) +nvidia_probe_of_connector (info,1 , &edidA);if (edidA && !fb_parse_edid (edidA, &var)) {printk ("nvidiafb: EDID found from BUS1\n" ); monA = &monitorA;
@@ -488,14 +492,16 @@ oldhead =NV_RD32 (par->PCRTC0,0x00000860 );NV_WR32 (par->PCRTC0,0x00000860 , oldhead |0x00000010 ); -nvidia_probe_i2c_connector (info,1 , &edidA); +if (nvidia_probe_i2c_connector (info,1 , &edidA)) +nvidia_probe_of_connector (info,1 , &edidA);if (edidA && !fb_parse_edid (edidA, &var)) {printk ("nvidiafb: EDID found from BUS1\n" ); monA = &monitorA;fb_edid_to_monspecs (edidA, monA); } -nvidia_probe_i2c_connector (info,2 , &edidB); +if (nvidia_probe_i2c_connector (info,2 , &edidB)) +nvidia_probe_of_connector (info,2 , &edidB);if (edidB && !fb_parse_edid (edidB, &var)) {printk ("nvidiafb: EDID found from BUS2\n" ); monB = &monitorB;
drivers/video/nvidia/nvidia.c +71 -13
140 lines not on this page · raw message
Quoted 1 line · Benjamin Herrenschmidt
Does that updated patch fixes it ?
Lots of rejects, so I manually applied the relevant part in nv_proto.h. It worked, though there were warnings:
drivers/video/nvidia/nv_setup.c: In function `NVCommonSetup':drivers/video/nvidia/nv_setup.c:408: warning: statement with no effect drivers/video/nvidia/nv_setup.c:496: warning: statement with no effect drivers/video/nvidia/nv_setup.c:504: warning: statement with no effect
drivers/video/nvidia/nv_proto.h line 49
Quoted 2 lines
drivers/video/nvidia/nv_proto.h +2
-0+#define nvidia_probe_i2c_connector (p, c, edid) (-1) +#define nvidia_probe_of_connector (p, c, edid) (-1)
Do you mean TRUE/SUCCESS here with (-1)?
Quoted 21 lines
Index:
linux-work/drivers/video/nvidia/nv_proto.h
===================================================================drivers/video/nvidia/nv_proto.h +1
-4@@ -31,7 +31,7 @@void NVLockUnlock (struct nvidia_par *par,int );/* in nvidia-i2c.c */ -#if defined(CONFIG_FB_NVIDIA_I2C ) || defined (CONFIG_PPC_OF ) +#ifdef CONFIG_FB_NVIDIA_I2C void nvidia_create_i2c_busses (struct nvidia_par *par);void nvidia_delete_i2c_busses (struct nvidia_par *par); int nvidia_probe_i2c_connector(struct fb_info *info, int conn,@@ -39,10 +39,14 @@#else #define nvidia_create_i2c_busses (...)#define nvidia_delete_i2c_busses (...) -#define nvidia_probe_i2c_connector (p, c, edid) \ -do { \ - *(edid) = NULL; \
drivers/video/nvidia/nv_proto.h line 50
Quoted 10 lines
drivers/video/nvidia/nv_proto.h +8
-1-} while(0) +#define nvidia_probe_i2c_connector (p, c, edid) (-1) +#endif + +#ifdef CONFIG_FB_OF +int nvidia_probe_of_connector (struct fb_info *info,int conn, +u8 ** out_edid); +#else +#define nvidia_probe_of_connector (p, c, edid) (-1)#endif
Regards,
Wu Fengguang
Quoted 5 lines · WU Fengguang
Quoted 1 line · Benjamin Herrenschmidt
Does that updated patch fixes it ?
Lots of rejects, so I manually applied the relevant part in
nv_proto.h. It worked, though there were warnings:
Quoted 8 lines
drivers/video/nvidia/nv_setup.c: In function `NVCommonSetup':drivers/video/nvidia/nv_setup.c:408: warning: statement with no effectdrivers/video/nvidia/nv_setup.c:496: warning: statement with no effectdrivers/video/nvidia/nv_setup.c:504: warning: statement with no effectdrivers/video/nvidia/nv_proto.h line 49
Quoted 2 lines
drivers/video/nvidia/nv_proto.h +2
-0+#define nvidia_probe_i2c_connector (p, c, edid) (-1) +#define nvidia_probe_of_connector (p, c, edid) (-1)Do you mean TRUE/SUCCESS here with (-1)?
Yes
Ben.