Revert "OvmfPkg/QemuVideoDxe: VMWare SVGA device support"

This reverts commit c137d95081690d4877fbeb5f1856972e84ac32f2.

The VMWare SVGA model now -- since commit 104bd1dc70 in QEMU --
falls back to stdvga (that is, Bochs) if we don't setup VMWare SVGA
FIFO.

To simplify QemuVideoDxe, we don't intend to implement the VMWare SVGA
FIFO setup feature. It means our current VMW SVGA driver code is
basically dead. To simplify the problem, we will replace the old
VMWare SVGA driver to Bochs interface. It should work on all QEMU
version.

The first step for using Bochs interface is to revert old driver.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: yuchenlin <yuchenlin@synology.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Regression-tested-by: Laszlo Ersek <lersek@redhat.com>
(cherry picked from commit 98856a724c2acdc0094220d4de615a557dad0f88)
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

1 files changed, 0 insertions, 157 deletions

diff --git a/OvmfPkg/QemuVideoDxe/Initialize.c b/OvmfPkg/QemuVideoDxe/Initialize.c
index 357124d628..d5d8cfef96 100644
--- a/OvmfPkg/QemuVideoDxe/Initialize.c
+++ b/OvmfPkg/QemuVideoDxe/Initialize.c
@@ -13,7 +13,6 @@
 

 **/

 

-#include <IndustryStandard/VmwareSvga.h>

 #include "Qemu.h"

 

 

@@ -347,159 +346,3 @@ QemuVideoBochsModeSetup (
   return EFI_SUCCESS;

 }

 

-EFI_STATUS

-QemuVideoVmwareSvgaModeSetup (

-  QEMU_VIDEO_PRIVATE_DATA *Private

-  )

-{

-  EFI_STATUS                            Status;

-  UINT32                                FbSize;

-  UINT32                                MaxWidth, MaxHeight;

-  UINT32                                Capabilities;

-  UINT32                                BitsPerPixel;

-  UINT32                                Index;

-  QEMU_VIDEO_MODE_DATA                  *ModeData;

-  QEMU_VIDEO_BOCHS_MODES                *VideoMode;

-  EFI_GRAPHICS_OUTPUT_MODE_INFORMATION  *ModeInfo;

-

-  VmwareSvgaWrite (Private, VmwareSvgaRegEnable, 0);

-

-  Private->ModeData =

-    AllocatePool (sizeof (Private->ModeData[0]) * QEMU_VIDEO_BOCHS_MODE_COUNT);

-  if (Private->ModeData == NULL) {

-    Status = EFI_OUT_OF_RESOURCES;

-    goto ModeDataAllocError;

-  }

-

-  Private->VmwareSvgaModeInfo =

-    AllocatePool (

-      sizeof (Private->VmwareSvgaModeInfo[0]) * QEMU_VIDEO_BOCHS_MODE_COUNT

-      );

-  if (Private->VmwareSvgaModeInfo == NULL) {

-    Status = EFI_OUT_OF_RESOURCES;

-    goto ModeInfoAllocError;

-  }

-

-  FbSize =       VmwareSvgaRead (Private, VmwareSvgaRegFbSize);

-  MaxWidth =     VmwareSvgaRead (Private, VmwareSvgaRegMaxWidth);

-  MaxHeight =    VmwareSvgaRead (Private, VmwareSvgaRegMaxHeight);

-  Capabilities = VmwareSvgaRead (Private, VmwareSvgaRegCapabilities);

-  if ((Capabilities & VMWARE_SVGA_CAP_8BIT_EMULATION) != 0) {

-    BitsPerPixel = VmwareSvgaRead (

-                     Private,

-                     VmwareSvgaRegHostBitsPerPixel

-                     );

-    VmwareSvgaWrite (

-      Private,

-      VmwareSvgaRegBitsPerPixel,

-      BitsPerPixel

-      );

-  } else {

-    BitsPerPixel = VmwareSvgaRead (

-                     Private,

-                     VmwareSvgaRegBitsPerPixel

-                     );

-  }

-

-  if (FbSize == 0       ||

-      MaxWidth == 0     ||

-      MaxHeight == 0    ||

-      BitsPerPixel == 0 ||

-      BitsPerPixel % 8 != 0) {

-    Status = EFI_DEVICE_ERROR;

-    goto Rollback;

-  }

-

-  ModeData = Private->ModeData;

-  ModeInfo = Private->VmwareSvgaModeInfo;

-  VideoMode = &QemuVideoBochsModes[0];

-  for (Index = 0; Index < QEMU_VIDEO_BOCHS_MODE_COUNT; Index++) {

-    UINTN RequiredFbSize;

-

-    RequiredFbSize = (UINTN) VideoMode->Width * VideoMode->Height *

-                     (BitsPerPixel / 8);

-    if (RequiredFbSize <= FbSize     &&

-        VideoMode->Width <= MaxWidth &&

-        VideoMode->Height <= MaxHeight) {

-      UINT32  BytesPerLine;

-      UINT32  RedMask, GreenMask, BlueMask, PixelMask;

-

-      VmwareSvgaWrite (

-        Private,

-        VmwareSvgaRegWidth,

-        VideoMode->Width

-        );

-      VmwareSvgaWrite (

-        Private,

-        VmwareSvgaRegHeight,

-        VideoMode->Height

-        );

-

-      ModeData->InternalModeIndex    = Index;

-      ModeData->HorizontalResolution = VideoMode->Width;

-      ModeData->VerticalResolution   = VideoMode->Height;

-      ModeData->ColorDepth           = BitsPerPixel;

-

-      //

-      // Setting VmwareSvgaRegWidth/VmwareSvgaRegHeight actually changes

-      // the device's display mode, so we save all properties of each mode up

-      // front to avoid inadvertent mode changes later.

-      //

-      ModeInfo->Version = 0;

-      ModeInfo->HorizontalResolution = ModeData->HorizontalResolution;

-      ModeInfo->VerticalResolution   = ModeData->VerticalResolution;

-

-      ModeInfo->PixelFormat = PixelBitMask;

-

-      RedMask   = VmwareSvgaRead (Private, VmwareSvgaRegRedMask);

-      ModeInfo->PixelInformation.RedMask = RedMask;

-

-      GreenMask = VmwareSvgaRead (Private, VmwareSvgaRegGreenMask);

-      ModeInfo->PixelInformation.GreenMask = GreenMask;

-

-      BlueMask  = VmwareSvgaRead (Private, VmwareSvgaRegBlueMask);

-      ModeInfo->PixelInformation.BlueMask = BlueMask;

-

-      //

-      // Reserved mask is whatever bits in the pixel not containing RGB data,

-      // so start with binary 1s for every bit in the pixel, then mask off

-      // bits already used for RGB. Special case 32 to avoid undefined

-      // behaviour in the shift.

-      //

-      if (BitsPerPixel == 32) {

-        if (BlueMask == 0xff && GreenMask == 0xff00 && RedMask == 0xff0000) {

-          ModeInfo->PixelFormat = PixelBlueGreenRedReserved8BitPerColor;

-        } else if (BlueMask == 0xff0000 &&

-                   GreenMask == 0xff00 &&

-                   RedMask == 0xff) {

-          ModeInfo->PixelFormat = PixelRedGreenBlueReserved8BitPerColor;

-        }

-        PixelMask = MAX_UINT32;

-      } else {

-        PixelMask = (1u << BitsPerPixel) - 1;

-      }

-      ModeInfo->PixelInformation.ReservedMask =

-        PixelMask & ~(RedMask | GreenMask | BlueMask);

-

-      BytesPerLine = VmwareSvgaRead (Private, VmwareSvgaRegBytesPerLine);

-      ModeInfo->PixelsPerScanLine = BytesPerLine / (BitsPerPixel / 8);

-

-      ModeData++;

-      ModeInfo++;

-    }

-    VideoMode++;

-  }

-  Private->MaxMode = ModeData - Private->ModeData;

-  return EFI_SUCCESS;

-

-Rollback:

-  FreePool (Private->VmwareSvgaModeInfo);

-  Private->VmwareSvgaModeInfo = NULL;

-

-ModeInfoAllocError:

-  FreePool (Private->ModeData);

-  Private->ModeData = NULL;

-

-ModeDataAllocError:

-  return Status;

-}