| From 768e847759d551c96e129e194588dbfb11a1d576 Mon Sep 17 00:00:00 2001 |
| From: Ben Skeggs <bskeggs@redhat.com> |
| Date: Wed, 19 Oct 2016 12:15:52 +1000 |
| Subject: drm/nouveau/kms: lvds panel strap moved again on maxwell |
| |
| From: Ben Skeggs <bskeggs@redhat.com> |
| |
| commit 768e847759d551c96e129e194588dbfb11a1d576 upstream. |
| |
| Signed-off-by: Ben Skeggs <bskeggs@redhat.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/gpu/drm/nouveau/nouveau_bios.c | 3 +++ |
| 1 file changed, 3 insertions(+) |
| |
| --- a/drivers/gpu/drm/nouveau/nouveau_bios.c |
| +++ b/drivers/gpu/drm/nouveau/nouveau_bios.c |
| @@ -333,6 +333,9 @@ get_fp_strap(struct drm_device *dev, str |
| 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 |
