lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] revert "nvidiafb: use generic ddc reading"

Browse Source 
Olaf reports that this gave him a black screen.

Cc: Olaf Hering <olaf@aepfle.de>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Andrew Morton
2006-10-11 01:20:35 -07:00
committed by Linus Torvalds
parent 53a5fbdc2d
commit 7e491092e4
2 changed files with 41 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/video/Kconfig
View File

@@ -701,7 +701,6 @@ config FB_NVIDIA
depends on FB && PCI depends on FB && PCI
select I2C_ALGOBIT if FB_NVIDIA_I2C select I2C_ALGOBIT if FB_NVIDIA_I2C
select I2C if FB_NVIDIA_I2C select I2C if FB_NVIDIA_I2C
select FB_DDC if FB_NVIDIA_I2C
select FB_MODE_HELPERS select FB_MODE_HELPERS
select FB_CFB_FILLRECT select FB_CFB_FILLRECT
select FB_CFB_COPYAREA select FB_CFB_COPYAREA

43
drivers/video/nvidia/nv_i2c.c
View File

@@ -160,12 +160,51 @@ void nvidia_delete_i2c_busses(struct nvidia_par *par)
} }
static u8 *nvidia_do_probe_i2c_edid(struct nvidia_i2c_chan *chan)
{
u8 start = 0x0;
struct i2c_msg msgs[] = {
{
.addr = 0x50,
.len = 1,
.buf = &start,
}, {
.addr = 0x50,
.flags = I2C_M_RD,
.len = EDID_LENGTH,
},
};
u8 *buf;
if (!chan->par)
return NULL;
buf = kmalloc(EDID_LENGTH, GFP_KERNEL);
if (!buf) {
dev_warn(&chan->par->pci_dev->dev, "Out of memory!\n");
return NULL;
}
msgs[1].buf = buf;
if (i2c_transfer(&chan->adapter, msgs, 2) == 2)
return buf;
dev_dbg(&chan->par->pci_dev->dev, "Unable to read EDID block.\n");
kfree(buf);
return NULL;
}
int nvidia_probe_i2c_connector(struct fb_info *info, int conn, u8 **out_edid) int nvidia_probe_i2c_connector(struct fb_info *info, int conn, u8 **out_edid)
{ {
struct nvidia_par *par = info->par; struct nvidia_par *par = info->par;
u8 *edid; u8 *edid = NULL;
int i;
edid = fb_ddc_read(&par->chan[conn - 1].adapter); for (i = 0; i < 3; i++) {
/* Do the real work */
edid = nvidia_do_probe_i2c_edid(&par->chan[conn - 1]);
if (edid)
break;
}
if (!edid && conn == 1) { if (!edid && conn == 1) {
/* try to get from firmware */ /* try to get from firmware */