ArmVirtPkg/ArmVirtQemu: add ResetSystem PEIM for upcoming TPM2 support

[mirror_edk2.git] / OvmfPkg / QemuVideoDxe / Gop.c

diff --git a/OvmfPkg/QemuVideoDxe/Gop.c b/OvmfPkg/QemuVideoDxe/Gop.c
index c9941ef138bd01caf819af8566cc221445218282..e49ec32cf16dfcee6027a3cdf328ffb7305d6de7 100644 (file)
--- a/OvmfPkg/QemuVideoDxe/Gop.c
+++ b/OvmfPkg/QemuVideoDxe/Gop.c
@@ -3,17 +3,10 @@
 \r
   Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r
 \r
-  This program and the accompanying materials\r
-  are licensed and made available under the terms and conditions of the BSD License\r
-  which accompanies this distribution. The full text of the license may be found at\r
-  http://opensource.org/licenses/bsd-license.php\r
-\r
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+  SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
 \r
-#include <IndustryStandard/VmwareSvga.h>\r
 #include "Qemu.h"\r
 \r
 STATIC\r
@@ -61,7 +54,7 @@ QemuVideoCompleteModeData (
 \r
   Private->PciIo->GetBarAttributes (\r
                         Private->PciIo,\r
-                        0,\r
+                        Private->FrameBufferVramBarIndex,\r
                         NULL,\r
                         (VOID**) &FrameBufDesc\r
                         );\r
@@ -79,46 +72,6 @@ QemuVideoCompleteModeData (
   return EFI_SUCCESS;\r
 }\r
 \r
-STATIC\r
-EFI_STATUS\r
-QemuVideoVmwareSvgaCompleteModeData (\r
-  IN  QEMU_VIDEO_PRIVATE_DATA           *Private,\r
-  OUT EFI_GRAPHICS_OUTPUT_PROTOCOL_MODE *Mode\r
-  )\r
-{\r
-  EFI_STATUS                            Status;\r
-  EFI_GRAPHICS_OUTPUT_MODE_INFORMATION  *Info;\r
-  EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR     *FrameBufDesc;\r
-  UINT32                                BytesPerLine, FbOffset, BytesPerPixel;\r
-\r
-  Info = Mode->Info;\r
-  CopyMem (Info, &Private->VmwareSvgaModeInfo[Mode->Mode], sizeof (*Info));\r
-  BytesPerPixel = Private->ModeData[Mode->Mode].ColorDepth / 8;\r
-  BytesPerLine = Info->PixelsPerScanLine * BytesPerPixel;\r
-\r
-  FbOffset = VmwareSvgaRead (Private, VmwareSvgaRegFbOffset);\r
-\r
-  Status = Private->PciIo->GetBarAttributes (\r
-                             Private->PciIo,\r
-                             PCI_BAR_IDX1,\r
-                             NULL,\r
-                             (VOID**) &FrameBufDesc\r
-                             );\r
-  if (EFI_ERROR (Status)) {\r
-    return EFI_DEVICE_ERROR;\r
-  }\r
-\r
-  Mode->FrameBufferBase = FrameBufDesc->AddrRangeMin + FbOffset;\r
-  Mode->FrameBufferSize = BytesPerLine * Info->VerticalResolution;\r
-  Mode->FrameBufferSize = EFI_PAGES_TO_SIZE (\r
-                            EFI_SIZE_TO_PAGES (Mode->FrameBufferSize)\r
-                            );\r
-\r
-  FreePool (FrameBufDesc);\r
-  return Status;\r
-}\r
-\r
-\r
 //\r
 // Graphics Output Protocol Member Functions\r
 //\r
@@ -167,14 +120,10 @@ Routine Description:
 \r
   *SizeOfInfo = sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION);\r
 \r
-  if (Private->Variant == QEMU_VIDEO_VMWARE_SVGA) {\r
-    CopyMem (*Info, &Private->VmwareSvgaModeInfo[ModeNumber], sizeof (**Info));\r
-  } else {\r
-    ModeData = &Private->ModeData[ModeNumber];\r
-    (*Info)->HorizontalResolution = ModeData->HorizontalResolution;\r
-    (*Info)->VerticalResolution   = ModeData->VerticalResolution;\r
-    QemuVideoCompleteModeInfo (ModeData, *Info);\r
-  }\r
+  ModeData = &Private->ModeData[ModeNumber];\r
+  (*Info)->HorizontalResolution = ModeData->HorizontalResolution;\r
+  (*Info)->VerticalResolution   = ModeData->VerticalResolution;\r
+  QemuVideoCompleteModeInfo (ModeData, *Info);\r
 \r
   return EFI_SUCCESS;\r
 }\r
@@ -224,12 +173,6 @@ Routine Description:
   case QEMU_VIDEO_BOCHS:\r
     InitializeBochsGraphicsMode (Private, &QemuVideoBochsModes[ModeData->InternalModeIndex]);\r
     break;\r
-  case QEMU_VIDEO_VMWARE_SVGA:\r
-    InitializeVmwareSvgaGraphicsMode (\r
-      Private,\r
-      &QemuVideoBochsModes[ModeData->InternalModeIndex]\r
-      );\r
-    break;\r
   default:\r
     ASSERT (FALSE);\r
     return EFI_DEVICE_ERROR;\r
@@ -240,11 +183,7 @@ Routine Description:
   This->Mode->Info->VerticalResolution = ModeData->VerticalResolution;\r
   This->Mode->SizeOfInfo = sizeof(EFI_GRAPHICS_OUTPUT_MODE_INFORMATION);\r
 \r
-  if (Private->Variant == QEMU_VIDEO_VMWARE_SVGA) {\r
-    QemuVideoVmwareSvgaCompleteModeData (Private, This->Mode);\r
-  } else {\r
-    QemuVideoCompleteModeData (Private, This->Mode);\r
-  }\r
+  QemuVideoCompleteModeData (Private, This->Mode);\r
 \r
   //\r
   // Re-initialize the frame buffer configure when mode changes.\r