Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 66fd1412 authored by Antonino A. Daplas's avatar Antonino A. Daplas Committed by Linus Torvalds
Browse files

nvidiafb: bring back generic ddc reading 



Make nvidiafb use fb_ddc_read().  This patch was submitted before but was
reverted due to problems in a non-x86 platform.  This includes a fix for that
where ddc reading is bypassed if there is no DDC bus (duh).

Signed-off-by: default avatarAntonino Daplas <adaplas@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 71c6efd9

drivers/video/nvidia/nv_i2c.c

+2 −42
Original line number Original line Diff line number Diff line
@@ -70,8 +70,6 @@ static int nvidia_gpio_getscl(void *data) 
	if (VGA_RD08(par->PCIO, 0x3d5) & 0x04)

	if (VGA_RD08(par->PCIO, 0x3d5) & 0x04)

		val = 1;

		val = 1;





	val = VGA_RD08(par->PCIO, 0x3d5);



	return val;

	return val;

}

}
@@ -159,51 +157,13 @@ 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 = NULL;

	u8 *edid = NULL;

	int i;





	for (i = 0; i < 3; i++) {

	if (par->chan[conn - 1].par)

		/* Do the real work */

		edid = fb_ddc_read(&par->chan[conn - 1].adapter);

		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 */