summaryrefslogtreecommitdiff
path: root/drm/nouveau/nouveau_bios.c
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2016-10-19 12:15:52 +1000
committerBen Skeggs <bskeggs@redhat.com>2016-11-07 10:06:19 +1000
commit818edc6c1a81eec081b21b9c8d46b6df06c14b78 (patch)
tree8e7dd3a734671cd96dde6f64984c66ac8e646045 /drm/nouveau/nouveau_bios.c
parent5f1d579370cf755789dda20a4ea4c405f1c98707 (diff)
downloadnouveau-818edc6c1a81eec081b21b9c8d46b6df06c14b78.tar.gz
kms: lvds panel strap moved again on maxwell
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drm/nouveau/nouveau_bios.c')
-rw-r--r--drm/nouveau/nouveau_bios.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drm/nouveau/nouveau_bios.c b/drm/nouveau/nouveau_bios.c
index a1570b109..23ffe8571 100644
--- a/drm/nouveau/nouveau_bios.c
+++ b/drm/nouveau/nouveau_bios.c
@@ -333,6 +333,9 @@ get_fp_strap(struct drm_device *dev, struct nvbios *bios)
if (bios->major_version < 5 && bios->data[0x48] & 0x4)
return NVReadVgaCrtc5758(dev, 0, 0xf) & 0xf;
+ if (drm->device.info.family >= NV_DEVICE_INFO_V0_MAXWELL)
+ return nvif_rd32(device, 0x001800) & 0x0000000f;
+ else
if (drm->device.info.family >= NV_DEVICE_INFO_V0_TESLA)
return (nvif_rd32(device, NV_PEXTDEV_BOOT_0) >> 24) & 0xf;
else