diff --git a/edk2-Revert-ArmVirtPkg-Remove-QemuRamfbDxe-display-device.patch b/edk2-Revert-ArmVirtPkg-Remove-QemuRamfbDxe-display-device.patch new file mode 100644 index 0000000..12a6aaf --- /dev/null +++ b/edk2-Revert-ArmVirtPkg-Remove-QemuRamfbDxe-display-device.patch @@ -0,0 +1,68 @@ +From 9415f40efd2fec3bec6d7144169622ca97d4d6de Mon Sep 17 00:00:00 2001 +From: Miroslav Rezanina +Date: Tue, 24 May 2022 04:40:06 -0400 +Subject: [PATCH 1/2] Revert "ArmVirtPkg: Remove QemuRamfbDxe display device + driver (RHEL only)" + +RH-Author: Miroslav Rezanina +RH-MergeRequest: 12: Revert "ArmVirtPkg: Remove QemuRamfbDxe display device driver (RHEL only)" +RH-Commit: [1/2] cee67de4c6cec6951511f666203cd22546f7f9d9 (mrezanin/centos-src-edk2) +RH-Bugzilla: 2087220 +RH-Acked-by: Oliver Steffen +RH-Acked-by: Laszlo Ersek +RH-Acked-by: Gerd Hoffmann + +This reverts commit 3c3aea0f37377981dbfc1470c188fbd370ddeeb3. + +Signed-off-by: Miroslav Rezanina +--- + ArmVirtPkg/ArmVirtQemu.dsc | 4 ++++ + ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc | 1 + + ArmVirtPkg/ArmVirtQemuKernel.dsc | 4 ++++ + 3 files changed, 9 insertions(+) + +diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc +index a9733583b2..656bdc8095 100644 +--- a/ArmVirtPkg/ArmVirtQemu.dsc ++++ b/ArmVirtPkg/ArmVirtQemu.dsc +@@ -507,6 +507,10 @@ + # + # Video support + # ++ OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf { ++ ++ gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|($(DEBUG_PRINT_ERROR_LEVEL)) & 0xFFBFFFFF ++ } + OvmfPkg/VirtioGpuDxe/VirtioGpu.inf + OvmfPkg/PlatformDxe/Platform.inf + +diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc +index a5c7769455..43a4eafae4 100644 +--- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc ++++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc +@@ -156,6 +156,7 @@ READ_LOCK_STATUS = TRUE + # + # Video support + # ++ INF OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf + INF OvmfPkg/VirtioGpuDxe/VirtioGpu.inf + INF OvmfPkg/PlatformDxe/Platform.inf + +diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc +index fb0792525d..2ecdd843c4 100644 +--- a/ArmVirtPkg/ArmVirtQemuKernel.dsc ++++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc +@@ -436,6 +436,10 @@ + # + # Video support + # ++ OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf { ++ ++ gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|($(DEBUG_PRINT_ERROR_LEVEL)) & 0xFFBFFFFF ++ } + OvmfPkg/VirtioGpuDxe/VirtioGpu.inf + OvmfPkg/PlatformDxe/Platform.inf + +-- +2.31.1 + diff --git a/edk2-Revert-OvmfPkg-Remove-QemuRamfbDxe-display-device-dr.patch b/edk2-Revert-OvmfPkg-Remove-QemuRamfbDxe-display-device-dr.patch new file mode 100644 index 0000000..aed35d6 --- /dev/null +++ b/edk2-Revert-OvmfPkg-Remove-QemuRamfbDxe-display-device-dr.patch @@ -0,0 +1,139 @@ +From 5b23da3b951f3764a941e15e6e6a422c345b37f6 Mon Sep 17 00:00:00 2001 +From: Miroslav Rezanina +Date: Tue, 24 May 2022 04:40:19 -0400 +Subject: [PATCH 2/2] Revert "OvmfPkg: Remove QemuRamfbDxe display device + driver (RHEL only)" + +RH-Author: Miroslav Rezanina +RH-MergeRequest: 12: Revert "ArmVirtPkg: Remove QemuRamfbDxe display device driver (RHEL only)" +RH-Commit: [2/2] f7680cbbdc5e1b456292017342838f6e96636c94 (mrezanin/centos-src-edk2) +RH-Bugzilla: 2087220 +RH-Acked-by: Oliver Steffen +RH-Acked-by: Laszlo Ersek +RH-Acked-by: Gerd Hoffmann + +This reverts commit 551cf28aeedca3c7cb5b08dcd23b37a473d85265. + +Signed-off-by: Miroslav Rezanina +--- + OvmfPkg/AmdSev/AmdSevX64.dsc | 4 ++++ + OvmfPkg/AmdSev/AmdSevX64.fdf | 1 + + OvmfPkg/OvmfPkgIa32.dsc | 4 ++++ + OvmfPkg/OvmfPkgIa32.fdf | 1 + + OvmfPkg/OvmfPkgIa32X64.dsc | 4 ++++ + OvmfPkg/OvmfPkgIa32X64.fdf | 1 + + OvmfPkg/OvmfPkgX64.dsc | 4 ++++ + OvmfPkg/OvmfPkgX64.fdf | 1 + + 8 files changed, 20 insertions(+) + +diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc +index 7b14dfd1ae..696dd470a2 100644 +--- a/OvmfPkg/AmdSev/AmdSevX64.dsc ++++ b/OvmfPkg/AmdSev/AmdSevX64.dsc +@@ -720,6 +720,10 @@ + + gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F + } ++ OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf { ++ ++ gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F ++ } + + # + # ISA Support +diff --git a/OvmfPkg/AmdSev/AmdSevX64.fdf b/OvmfPkg/AmdSev/AmdSevX64.fdf +index 29d9827294..7a1c357406 100644 +--- a/OvmfPkg/AmdSev/AmdSevX64.fdf ++++ b/OvmfPkg/AmdSev/AmdSevX64.fdf +@@ -290,6 +290,7 @@ INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf + + INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf + ++INF OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf + INF OvmfPkg/PlatformDxe/Platform.inf + INF OvmfPkg/AmdSevDxe/AmdSevDxe.inf + INF OvmfPkg/IoMmuDxe/IoMmuDxe.inf +diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc +index f5314a3862..d3583ba18a 100644 +--- a/OvmfPkg/OvmfPkgIa32.dsc ++++ b/OvmfPkg/OvmfPkgIa32.dsc +@@ -817,6 +817,10 @@ + gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F + } + !endif ++ OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf { ++ ++ gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F ++ } + + # + # ISA Support +diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf +index 818d894262..2ebe1d53f5 100644 +--- a/OvmfPkg/OvmfPkgIa32.fdf ++++ b/OvmfPkg/OvmfPkgIa32.fdf +@@ -312,6 +312,7 @@ INF RuleOverride=CSM OvmfPkg/Csm/Csm16/Csm16.inf + INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf + !endif + ++INF OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf + INF OvmfPkg/PlatformDxe/Platform.inf + INF OvmfPkg/IoMmuDxe/IoMmuDxe.inf + +diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc +index 6116654aa8..a373a405ff 100644 +--- a/OvmfPkg/OvmfPkgIa32X64.dsc ++++ b/OvmfPkg/OvmfPkgIa32X64.dsc +@@ -831,6 +831,10 @@ + gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F + } + !endif ++ OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf { ++ ++ gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F ++ } + + # + # ISA Support +diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf +index 5bf9ce771f..d72b0c333a 100644 +--- a/OvmfPkg/OvmfPkgIa32X64.fdf ++++ b/OvmfPkg/OvmfPkgIa32X64.fdf +@@ -321,6 +321,7 @@ INF RuleOverride=CSM OvmfPkg/Csm/Csm16/Csm16.inf + INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf + !endif + ++INF OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf + INF OvmfPkg/PlatformDxe/Platform.inf + INF OvmfPkg/AmdSevDxe/AmdSevDxe.inf + INF OvmfPkg/IoMmuDxe/IoMmuDxe.inf +diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc +index e7cbee5d08..2dc172a767 100644 +--- a/OvmfPkg/OvmfPkgX64.dsc ++++ b/OvmfPkg/OvmfPkgX64.dsc +@@ -828,6 +828,10 @@ + gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F + } + !endif ++ OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf { ++ ++ gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F ++ } + + # + # ISA Support +diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf +index c894db8c3b..df70ccff09 100644 +--- a/OvmfPkg/OvmfPkgX64.fdf ++++ b/OvmfPkg/OvmfPkgX64.fdf +@@ -343,6 +343,7 @@ INF RuleOverride=CSM OvmfPkg/Csm/Csm16/Csm16.inf + INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf + !endif + ++INF OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf + INF OvmfPkg/PlatformDxe/Platform.inf + INF OvmfPkg/AmdSevDxe/AmdSevDxe.inf + INF OvmfPkg/IoMmuDxe/IoMmuDxe.inf +-- +2.31.1 + diff --git a/edk2.spec b/edk2.spec index 0408078..6fe6304 100644 --- a/edk2.spec +++ b/edk2.spec @@ -24,7 +24,7 @@ ExclusiveArch: x86_64 aarch64 Name: edk2 Version: %{GITDATE}git%{GITCOMMIT} -Release: 1%{?dist} +Release: 2%{?dist} Summary: UEFI firmware for 64-bit virtual machines License: BSD-2-Clause-Patent and OpenSSL and MIT URL: http://www.tianocore.org @@ -80,6 +80,10 @@ Patch0032: 0032-OvmfPkg-Remove-HttpDynamicCommand-from-shell-RHEL-on.patch Patch0033: 0033-ArmVirtPkg-Remove-HttpDynamicCommand-from-shell-RHEL.patch Patch0034: 0034-OvmfPkg-Remove-LinuxInitrdDynamicShellCommand-RHEL-o.patch Patch0035: 0035-ArmVirtPkg-Remove-LinuxInitrdDynamicShellCommand-RHE.patch +# For bz#2087220 - VNC display show "Guest has not initialized the display" when using ramfb + ovmf +Patch36: edk2-Revert-ArmVirtPkg-Remove-QemuRamfbDxe-display-device.patch +# For bz#2087220 - VNC display show "Guest has not initialized the display" when using ramfb + ovmf +Patch37: edk2-Revert-OvmfPkg-Remove-QemuRamfbDxe-display-device-dr.patch # python3-devel and libuuid-devel are required for building tools. @@ -530,6 +534,12 @@ KERNEL_IMG=$(rpm -q -l $KERNEL_PKG | egrep '^/lib/modules/[^/]+/vmlinuz$') %changelog +* Thu May 26 2022 Miroslav Rezanina - 20220221gitb24306f15d-2 +- edk2-Revert-ArmVirtPkg-Remove-QemuRamfbDxe-display-device.patch [bz#2087220] +- edk2-Revert-OvmfPkg-Remove-QemuRamfbDxe-display-device-dr.patch [bz#2087220] +- Resolves: bz#2087220 + (VNC display show "Guest has not initialized the display" when using ramfb + ovmf) + * Thu Mar 31 2022 Miroslav Rezanina - 20220221gitb24306f15d-1 - Rebae to edk-stable-202202 [bz#2056910] - Resolves: bz#2056910