tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

QemuVideo: stdvga mmio bar support 

The qemu standard vga has a MMIO bar in qemu 1.3+.
Use it if available.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13969 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
jljusten 2012-11-27 19:11:45 +00:00
parent 54f9b9accb
commit cdb4f5dcb1
3 changed files with 103 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
OvmfPkg/QemuVideoDxe/Driver.c
View File

@ -15,6 +15,7 @@
**/ **/
#include "Qemu.h" #include "Qemu.h"
#include <IndustryStandard/Acpi.h>
EFI_DRIVER_BINDING_PROTOCOL gQemuVideoDriverBinding = { EFI_DRIVER_BINDING_PROTOCOL gQemuVideoDriverBinding = {
QemuVideoControllerDriverSupported, QemuVideoControllerDriverSupported,
@ -44,7 +45,7 @@ QEMU_VIDEO_CARD gQemuVideoCardList[] = {
},{ },{
0x1234, 0x1234,
0x1111, 0x1111,
QEMU_VIDEO_BOCHS, QEMU_VIDEO_BOCHS_MMIO,
L"QEMU Standard VGA" L"QEMU Standard VGA"
},{ },{
0x1b36, 0x1b36,
@ -200,13 +201,14 @@ QemuVideoControllerDriverStart (
IN EFI_DEVICE_PATH_PROTOCOL *RemainingDevicePath IN EFI_DEVICE_PATH_PROTOCOL *RemainingDevicePath
) )
{ {
EFI_STATUS Status; EFI_STATUS Status;
QEMU_VIDEO_PRIVATE_DATA *Private; QEMU_VIDEO_PRIVATE_DATA *Private;
BOOLEAN PciAttributesSaved; BOOLEAN PciAttributesSaved;
EFI_DEVICE_PATH_PROTOCOL *ParentDevicePath; EFI_DEVICE_PATH_PROTOCOL *ParentDevicePath;
ACPI_ADR_DEVICE_PATH AcpiDeviceNode; ACPI_ADR_DEVICE_PATH AcpiDeviceNode;
PCI_TYPE00 Pci; PCI_TYPE00 Pci;
QEMU_VIDEO_CARD *Card; QEMU_VIDEO_CARD *Card;
EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR *MmioDesc;
PciAttributesSaved = FALSE; PciAttributesSaved = FALSE;
// //
@ -285,10 +287,31 @@ QemuVideoControllerDriverStart (
goto Error; goto Error;
} }
//
// Check whenever the qemu stdvga mmio bar is present (qemu 1.3+).
//
if (Private->Variant == QEMU_VIDEO_BOCHS_MMIO) {
Status = Private->PciIo->GetBarAttributes (
Private->PciIo,
PCI_BAR_IDX2,
NULL,
(VOID**) &MmioDesc
);
if (EFI_ERROR (Status) ||
MmioDesc->ResType != ACPI_ADDRESS_SPACE_TYPE_MEM) {
DEBUG ((EFI_D_INFO, "QemuVideo: No mmio bar, fallback to port io\n"));
Private->Variant = QEMU_VIDEO_BOCHS;
} else {
DEBUG ((EFI_D_INFO, "QemuVideo: Using mmio bar @ 0x%lx\n",
MmioDesc->AddrRangeMin));
}
}
// //
// Check if accessing the bochs interface works. // Check if accessing the bochs interface works.
// //
if (Private->Variant == QEMU_VIDEO_BOCHS) { if (Private->Variant == QEMU_VIDEO_BOCHS_MMIO ||
Private->Variant == QEMU_VIDEO_BOCHS) {
UINT16 BochsId; UINT16 BochsId;
BochsId = BochsRead(Private, VBE_DISPI_INDEX_ID); BochsId = BochsRead(Private, VBE_DISPI_INDEX_ID);
if ((BochsId & 0xFFF0) != VBE_DISPI_ID0) { if ((BochsId & 0xFFF0) != VBE_DISPI_ID0) {
@ -359,6 +382,7 @@ QemuVideoControllerDriverStart (
case QEMU_VIDEO_CIRRUS_5446: case QEMU_VIDEO_CIRRUS_5446:
Status = QemuVideoCirrusModeSetup (Private); Status = QemuVideoCirrusModeSetup (Private);
break; break;
case QEMU_VIDEO_BOCHS_MMIO:
case QEMU_VIDEO_BOCHS: case QEMU_VIDEO_BOCHS:
Status = QemuVideoBochsModeSetup (Private); Status = QemuVideoBochsModeSetup (Private);
break; break;
@ -644,10 +668,10 @@ SetPaletteColor (
UINT8 Blue UINT8 Blue
) )
{ {
outb (Private, PALETTE_INDEX_REGISTER, (UINT8) Index); VgaOutb (Private, PALETTE_INDEX_REGISTER, (UINT8) Index);
outb (Private, PALETTE_DATA_REGISTER, (UINT8) (Red >> 2)); VgaOutb (Private, PALETTE_DATA_REGISTER, (UINT8) (Red >> 2));
outb (Private, PALETTE_DATA_REGISTER, (UINT8) (Green >> 2)); VgaOutb (Private, PALETTE_DATA_REGISTER, (UINT8) (Green >> 2));
outb (Private, PALETTE_DATA_REGISTER, (UINT8) (Blue >> 2)); VgaOutb (Private, PALETTE_DATA_REGISTER, (UINT8) (Blue >> 2));
} }
/** /**
@ -791,8 +815,22 @@ BochsWrite (
UINT16 Data UINT16 Data
) )
{ {
outw (Private, VBE_DISPI_IOPORT_INDEX, Reg); EFI_STATUS Status;
outw (Private, VBE_DISPI_IOPORT_DATA, Data);
if (Private->Variant == QEMU_VIDEO_BOCHS_MMIO) {
Status = Private->PciIo->Mem.Write (
Private->PciIo,
EfiPciIoWidthUint16,
PCI_BAR_IDX2,
0x500 + (Reg << 1),
1,
&Data
);
ASSERT_EFI_ERROR (Status);
} else {
outw (Private, VBE_DISPI_IOPORT_INDEX, Reg);
outw (Private, VBE_DISPI_IOPORT_DATA, Data);
}
} }
UINT16 UINT16
@ -801,13 +839,50 @@ BochsRead (
UINT16 Reg UINT16 Reg
) )
{ {
UINT16 Data; EFI_STATUS Status;
UINT16 Data;
outw (Private, VBE_DISPI_IOPORT_INDEX, Reg); if (Private->Variant == QEMU_VIDEO_BOCHS_MMIO) {
Data = inw (Private, VBE_DISPI_IOPORT_DATA); Status = Private->PciIo->Mem.Read (
Private->PciIo,
EfiPciIoWidthUint16,
PCI_BAR_IDX2,
0x500 + (Reg << 1),
1,
&Data
);
ASSERT_EFI_ERROR (Status);
} else {
outw (Private, VBE_DISPI_IOPORT_INDEX, Reg);
Data = inw (Private, VBE_DISPI_IOPORT_DATA);
}
return Data; return Data;
} }
VOID
VgaOutb (
QEMU_VIDEO_PRIVATE_DATA *Private,
UINTN Reg,
UINT8 Data
)
{
EFI_STATUS Status;
if (Private->Variant == QEMU_VIDEO_BOCHS_MMIO) {
Status = Private->PciIo->Mem.Write (
Private->PciIo,
EfiPciIoWidthUint8,
PCI_BAR_IDX2,
0x400 - 0x3c0 + Reg,
1,
&Data
);
ASSERT_EFI_ERROR (Status);
} else {
outb (Private, Reg, Data);
}
}
VOID VOID
InitializeBochsGraphicsMode ( InitializeBochsGraphicsMode (
QEMU_VIDEO_PRIVATE_DATA *Private, QEMU_VIDEO_PRIVATE_DATA *Private,
@ -818,7 +893,7 @@ InitializeBochsGraphicsMode (
ModeData->Width, ModeData->Height, ModeData->ColorDepth)); ModeData->Width, ModeData->Height, ModeData->ColorDepth));
/* unblank */ /* unblank */
outb (Private, ATT_ADDRESS_REGISTER, 0x20); VgaOutb (Private, ATT_ADDRESS_REGISTER, 0x20);
BochsWrite (Private, VBE_DISPI_INDEX_ENABLE, 0); BochsWrite (Private, VBE_DISPI_INDEX_ENABLE, 0);
BochsWrite (Private, VBE_DISPI_INDEX_BANK, 0); BochsWrite (Private, VBE_DISPI_INDEX_BANK, 0);

1
OvmfPkg/QemuVideoDxe/Gop.c
View File

@ -186,6 +186,7 @@ Routine Description:
case QEMU_VIDEO_CIRRUS_5446: case QEMU_VIDEO_CIRRUS_5446:
InitializeCirrusGraphicsMode (Private, &QemuVideoCirrusModes[ModeData->ModeNumber]); InitializeCirrusGraphicsMode (Private, &QemuVideoCirrusModes[ModeData->ModeNumber]);
break; break;
case QEMU_VIDEO_BOCHS_MMIO:
case QEMU_VIDEO_BOCHS: case QEMU_VIDEO_BOCHS:
InitializeBochsGraphicsMode (Private, &QemuVideoBochsModes[ModeData->ModeNumber]); InitializeBochsGraphicsMode (Private, &QemuVideoBochsModes[ModeData->ModeNumber]);
break; break;

8
OvmfPkg/QemuVideoDxe/Qemu.h
View File

@ -90,6 +90,7 @@ typedef enum {
QEMU_VIDEO_CIRRUS_5430 = 1, QEMU_VIDEO_CIRRUS_5430 = 1,
QEMU_VIDEO_CIRRUS_5446, QEMU_VIDEO_CIRRUS_5446,
QEMU_VIDEO_BOCHS, QEMU_VIDEO_BOCHS,
QEMU_VIDEO_BOCHS_MMIO,
} QEMU_VIDEO_VARIANT; } QEMU_VIDEO_VARIANT;
typedef struct { typedef struct {
@ -478,6 +479,13 @@ BochsRead (
UINT16 Reg UINT16 Reg
); );
VOID
VgaOutb (
QEMU_VIDEO_PRIVATE_DATA *Private,
UINTN Reg,
UINT8 Data
);
EFI_STATUS EFI_STATUS
QemuVideoCirrusModeSetup ( QemuVideoCirrusModeSetup (
QEMU_VIDEO_PRIVATE_DATA *Private QEMU_VIDEO_PRIVATE_DATA *Private