From: Ben Skeggs <bskeggs@redhat.com>
Date: Wed, 29 Jun 2011 23:03:36 +0000 (+1000)
Subject: drm/nv50/dp: fix hack to work for macbooks booted via EFI
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=88c8431cbbccdb9ef7c13f0ba18022e2cb35c7f7;p=linux-beck.git

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 c25c59386420..ffe8b483b7b0 100644
--- a/drivers/gpu/drm/nouveau/nv50_sor.c
+++ b/drivers/gpu/drm/nouveau/nv50_sor.c
@@ -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: