From 1acc576d2dd47213a5abeb96c8636a2cbea67d42 Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Tue, 19 Jul 2011 15:59:39 +1000 Subject: [PATCH] --- yaml --- r: 269657 b: refs/heads/master c: 6b70e481671cff087a39d40cd823435d0177000c h: refs/heads/master i: 269655: 3babe9053079e38492c302bfe9d74011c71acc32 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_i2c.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 89b0b42608d1..1f7789871b6c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2228c6fe04ddc303e90c05dd9430539fbcd8fa18 +refs/heads/master: 6b70e481671cff087a39d40cd823435d0177000c diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_i2c.c b/trunk/drivers/gpu/drm/nouveau/nouveau_i2c.c index 739c0ac3a9b7..f6a27fabcfe0 100644 --- a/trunk/drivers/gpu/drm/nouveau/nouveau_i2c.c +++ b/trunk/drivers/gpu/drm/nouveau/nouveau_i2c.c @@ -286,7 +286,10 @@ nouveau_i2c_find(struct drm_device *dev, int index) val = 0xe001; } - nv_wr32(dev, reg, (nv_rd32(dev, reg) & ~0xf003) | val); + /* nfi, but neither auxch or i2c work if it's 1 */ + nv_mask(dev, reg + 0x0c, 0x00000001, 0x00000000); + /* nfi, but switches auxch vs normal i2c */ + nv_mask(dev, reg + 0x00, 0x0000f003, val); } if (!i2c->chan && nouveau_i2c_init(dev, i2c, index))