drm/nouveau: magic to make auxch on new macbooks booted in EFI mode work

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
git-mirror · Sep 20, 2011 · 6b70e48 · 6b70e48
1 parent 2228c6f
commit 6b70e48
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/drivers/gpu/drm/nouveau/nouveau_i2c.c b/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))