diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2012-03-26 09:18:40 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-03-26 10:36:07 +0200 |
| commit | 59365671464539dc695bbf4d4bf37aabfd8604f2 (patch) | |
| tree | f4db0448c489db9ec50b01b1be5a91108d8de546 /drivers | |
| parent | drm/nouveau: default to 8bpc for non-LVDS panels if EDID isn't useful (diff) | |
| download | linux-59365671464539dc695bbf4d4bf37aabfd8604f2.tar.xz linux-59365671464539dc695bbf4d4bf37aabfd8604f2.zip | |
drm/nouveau/i2c: fix thinko/regression on really old chipsets
Fixes i2c on my TNT2.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_i2c.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_i2c.c b/drivers/gpu/drm/nouveau/nouveau_i2c.c index 8f4f914d9eab..e2be95af2e52 100644 --- a/drivers/gpu/drm/nouveau/nouveau_i2c.c +++ b/drivers/gpu/drm/nouveau/nouveau_i2c.c @@ -315,8 +315,8 @@ nouveau_i2c_init(struct drm_device *dev) struct drm_nouveau_private *dev_priv = dev->dev_private; struct nvbios *bios = &dev_priv->vbios; struct nouveau_i2c_chan *port; + u8 version = 0x00, entries, recordlen; u8 *i2c, *entry, legacy[2][4] = {}; - u8 version, entries, recordlen; int ret, i; INIT_LIST_HEAD(&dev_priv->i2c_ports); @@ -346,12 +346,12 @@ nouveau_i2c_init(struct drm_device *dev) if (i2c[7]) legacy[1][1] = i2c[7]; } - if (i2c && version >= 0x30) { + if (version >= 0x30) { entry = i2c[1] + i2c; entries = i2c[2]; recordlen = i2c[3]; } else - if (i2c) { + if (version) { entry = i2c; entries = 16; recordlen = 4; |