drm/nv50/dp: fix hack to work for macbooks booted via EFI
authorBen Skeggs <bskeggs@redhat.com>
Wed, 29 Jun 2011 23:03:36 +0000 (09:03 +1000)
committerBen Skeggs <bskeggs@redhat.com>
Sun, 24 Jul 2011 23:40:41 +0000 (09:40 +1000)
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/nv50_sor.c

index c25c59386420d4a3c5eca828238e60edabd51fe3..ffe8b483b7b0735a175d49ef0601d313c247f944 100644 (file)
@@ -318,6 +318,8 @@ nv50_sor_create(struct drm_connector *connector, struct dcb_entry *entry)
                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: