From d53ed7359028caa01cbf60a819abd0e0b0da7a57 Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Mon, 28 Sep 2020 06:00:39 +0000 Subject: [PATCH] Fix video on PCI heuristic The video on PCI heuristic was broken. It was supposed to infer a video device when the last element of the path was a PCI DEVICE PATH node. However, the last node in the device path is an END node, so this heuristic never fired. This leads, among other things, to bhyve only producing output in the serial connection once we leave the boot loader. This restores the dual headed boot on bhyve + UEFI (as we did in 11.2), but will favor serial in the absence of other config which may be a change from 11.2. MFC After: 3 days Differential Revision: https://reviews.freebsd.org/D26572 --- stand/efi/loader/main.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/stand/efi/loader/main.c b/stand/efi/loader/main.c index 06e517ba76d..d0d09ebd6a7 100644 --- a/stand/efi/loader/main.c +++ b/stand/efi/loader/main.c @@ -739,6 +739,10 @@ parse_uefi_con_out(void) ep = buf + sz; node = (EFI_DEVICE_PATH *)buf; while ((char *)node < ep) { + if (IsDevicePathEndType(node)) { + if (pci_pending && vid_seen == 0) + vid_seen = ++seen; + } pci_pending = false; if (DevicePathType(node) == ACPI_DEVICE_PATH && (DevicePathSubType(node) == ACPI_DP || @@ -772,8 +776,6 @@ parse_uefi_con_out(void) } node = NextDevicePathNode(node); } - if (pci_pending && vid_seen == 0) - vid_seen = ++seen; /* * Truth table for RB_MULTIPLE | RB_SERIAL -- 2.45.0