Skip to content

Commit

Permalink
drm/nouveau: Put back the old 2-messages I2C slave test.
Browse files Browse the repository at this point in the history
I was hoping we could detect I2C devices at a given address without
actually writing data into them, but apparently some DDC slaves get
confused with 0-bytes transactions. Put the good old test back.

Reported-by: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
  • Loading branch information
Francisco Jerez authored and Ben Skeggs committed Jul 26, 2010
1 parent e04d8e8 commit f1feda7
Showing 1 changed file with 15 additions and 4 deletions.
19 changes: 15 additions & 4 deletions drivers/gpu/drm/nouveau/nouveau_i2c.c
Original file line number Diff line number Diff line change
Expand Up @@ -281,12 +281,23 @@ nouveau_i2c_find(struct drm_device *dev, int index)
bool
nouveau_probe_i2c_addr(struct nouveau_i2c_chan *i2c, int addr)
{
struct i2c_msg msg = {
.addr = addr,
.len = 0,
uint8_t buf[] = { 0 };
struct i2c_msg msgs[] = {
{
.addr = addr,
.flags = 0,
.len = 1,
.buf = buf,
},
{
.addr = addr,
.flags = I2C_M_RD,
.len = 1,
.buf = buf,
}
};

return i2c_transfer(&i2c->adapter, &msg, 1) == 1;
return i2c_transfer(&i2c->adapter, msgs, 2) == 2;
}

int
Expand Down

0 comments on commit f1feda7

Please sign in to comment.