| commit | 88c8431cbbccdb9ef7c13f0ba18022e2cb35c7f7 | [log] [tgz] |
|---|---|---|
| author | Ben Skeggs <bskeggs@redhat.com> | Thu Jun 30 09:03:36 2011 +1000 |
| committer | Ben Skeggs <bskeggs@redhat.com> | Mon Jul 25 09:40:41 2011 +1000 |
| tree | 152d8fe5a9c3c8b332481d41029d8b5b91f56110 | |
| parent | 60f7ab06651db7d9916c0d9138ed3b12676e920d [diff] |
drm/nv50/dp: fix hack to work for macbooks booted via EFI Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
diff --git a/drivers/gpu/drm/nouveau/nv50_sor.c b/drivers/gpu/drm/nouveau/nv50_sor.c index c25c593..ffe8b48 100644 --- a/drivers/gpu/drm/nouveau/nv50_sor.c +++ b/drivers/gpu/drm/nouveau/nv50_sor.c
@@ -318,6 +318,8 @@ uint32_t tmp; tmp = nv_rd32(dev, 0x61c700 + (or * 0x800)); + if (!tmp) + tmp = nv_rd32(dev, 0x610798 + (or * 8)); switch ((tmp & 0x00000f00) >> 8) { case 8: