edk2/edk2-Revert-ArmVirtPkg-Remove-QemuRamfbDxe-display-device.patch
Miroslav Rezanina f9a9b2c169 * Thu May 26 2022 Miroslav Rezanina <mrezanin@redhat.com> - 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)
2022-05-26 02:05:14 -04:00

69 lines
2.3 KiB
Diff

From 9415f40efd2fec3bec6d7144169622ca97d4d6de Mon Sep 17 00:00:00 2001
From: Miroslav Rezanina <mrezanin@redhat.com>
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 <mrezanin@redhat.com>
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 <osteffen@redhat.com>
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
RH-Acked-by: Gerd Hoffmann <kraxel@redhat.com>
This reverts commit 3c3aea0f37377981dbfc1470c188fbd370ddeeb3.
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
---
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 {
+ <PcdsFixedAtBuild>
+ 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 {
+ <PcdsFixedAtBuild>
+ gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|($(DEBUG_PRINT_ERROR_LEVEL)) & 0xFFBFFFFF
+ }
OvmfPkg/VirtioGpuDxe/VirtioGpu.inf
OvmfPkg/PlatformDxe/Platform.inf
--
2.31.1