diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2011-06-30 09:03:36 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2011-07-25 09:40:41 +1000 |
| commit | 88c8431cbbccdb9ef7c13f0ba18022e2cb35c7f7 (patch) | |
| tree | 152d8fe5a9c3c8b332481d41029d8b5b91f56110 /drivers/gpu/drm/nouveau/nv50_sor.c | |
| parent | 60f7ab06651db7d9916c0d9138ed3b12676e920d (diff) | |
| download | blackbird-op-linux-88c8431cbbccdb9ef7c13f0ba18022e2cb35c7f7.tar.gz blackbird-op-linux-88c8431cbbccdb9ef7c13f0ba18022e2cb35c7f7.zip | |
drm/nv50/dp: fix hack to work for macbooks booted via EFI
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nv50_sor.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nv50_sor.c | 2 |
1 files changed, 2 insertions, 0 deletions
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: |
