Commit 768e8477 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/kms: lvds panel strap moved again on maxwell 



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
Cc: stable@vger.kernel.org
parent 4d987730

drivers/gpu/drm/nouveau/nouveau_bios.c

+3 −0
Original line number Diff line number Diff line
@@ -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