The patch titled
savagefb: Use generic DDC reading
has been removed from the -mm tree. Its filename is
savagefb-use-generic-ddc-reading.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: savagefb: Use generic DDC reading
From: "Antonino A. Daplas" <adaplas@xxxxxxxxx>
Update driver to use generic DDC reading
[khali@xxxxxxxxxxxx: fix oops in i2c handling]
Signed-off-by: Antonino Daplas <adaplas@xxxxxxx>
Signed-off-by: Jean Delvare <khali@xxxxxxxxxxxx>
Cc: Jurriaan <thunder7@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/video/Kconfig | 1
drivers/video/savage/savagefb-i2c.c | 47 ++------------------------
2 files changed, 6 insertions(+), 42 deletions(-)
diff -puN drivers/video/Kconfig~savagefb-use-generic-ddc-reading drivers/video/Kconfig
--- a/drivers/video/Kconfig~savagefb-use-generic-ddc-reading
+++ a/drivers/video/Kconfig
@@ -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
diff -puN drivers/video/savage/savagefb-i2c.c~savagefb-use-generic-ddc-reading drivers/video/savage/savagefb-i2c.c
--- a/drivers/video/savage/savagefb-i2c.c~savagefb-use-generic-ddc-reading
+++ a/drivers/video/savage/savagefb-i2c.c
@@ -213,52 +213,15 @@ void savagefb_delete_i2c_busses(struct f
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 */
_
Patches currently in -mm which might be from adaplas@xxxxxxxxx are
origin.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
