diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2011-07-19 07:59:39 +0200 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2011-09-20 08:08:32 +0200 |
| commit | 6b70e481671cff087a39d40cd823435d0177000c (patch) | |
| tree | 2dab344baebe1747c6402db94dca642f6119731c /drivers/gpu/drm/nouveau/nouveau_i2c.c | |
| parent | drm/nouveau/pm: Document and expose CL and WR for 0x1002Cx (diff) | |
| download | linux-6b70e481671cff087a39d40cd823435d0177000c.tar.xz linux-6b70e481671cff087a39d40cd823435d0177000c.zip | |
drm/nouveau: magic to make auxch on new macbooks booted in EFI mode work
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_i2c.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_i2c.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_i2c.c b/drivers/gpu/drm/nouveau/nouveau_i2c.c index 739c0ac3a9b7..f6a27fabcfe0 100644 --- 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)) |