hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[PATCH] savagefb: Use generic DDC reading 

Update driver to use generic DDC reading

[khali@linux-fr.org: fix oops in i2c handling]
Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Jurriaan <thunder7@xs4all.nl>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Antonino A. Daplas 2006-10-03 01:14:45 -07:00 committed by Linus Torvalds
parent e80987f8db
commit 946c4eab86
2 changed files with 6 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/video/Kconfig
View File

@ -1148,6 +1148,7 @@ config FB_SAVAGE
depends on FB && PCI && EXPERIMENTAL
select I2C_ALGOBIT if FB_SAVAGE_I2C
select I2C if FB_SAVAGE_I2C
select FB_DDC if FB_SAVAGE_I2C
select FB_MODE_HELPERS
select FB_CFB_FILLRECT
select FB_CFB_COPYAREA

47
drivers/video/savage/savagefb-i2c.c
View File

@ -213,52 +213,15 @@ void savagefb_delete_i2c_busses(struct fb_info *info)
par->chan.par = NULL;
}
static u8 *savage_do_probe_i2c_edid(struct savagefb_i2c_chan *chan)
{
u8 start = 0x0;
struct i2c_msg msgs[] = {
{
.addr = SAVAGE_DDC,
.len = 1,
.buf = &start,
}, {
.addr = SAVAGE_DDC,
.flags = I2C_M_RD,
.len = EDID_LENGTH,
},
};
u8 *buf = NULL;
if (chan->par) {
buf = kmalloc(EDID_LENGTH, GFP_KERNEL);
if (buf) {
msgs[1].buf = buf;
if (i2c_transfer(&chan->adapter, msgs, 2) != 2) {
dev_dbg(&chan->par->pcidev->dev,
"Unable to read EDID block.\n");
kfree(buf);
buf = NULL;
}
}
}
return buf;
}
int savagefb_probe_i2c_connector(struct fb_info *info, u8 **out_edid)
{
struct savagefb_par *par = info->par;
u8 *edid = NULL;
int i;
u8 *edid;
for (i = 0; i < 3; i++) {
/* Do the real work */
edid = savage_do_probe_i2c_edid(&par->chan);
if (edid)
break;
}
if (par->chan.par)
edid = fb_ddc_read(&par->chan.adapter);
else
edid = NULL;
if (!edid) {
/* try to get from firmware */