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

OvmfPkg/QemuVideoDxe: Frame buffer config size may change in new mode 

https://bugzilla.tianocore.org/show_bug.cgi?id=339

The patch removes the assumption in QemuVideoDxe driver that it
wrongly assumes the frame buffer configure size is the same in
different video modes.
The assumption is true in old FrameBufferBltLib but is false in
new implementation.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
This commit is contained in:
Ruiyu Ni 2017-01-23 14:07:42 +08:00
parent 1d71d0c777
commit 6a12538657
1 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
OvmfPkg/QemuVideoDxe/Gop.c
View File

@ -1,7 +1,7 @@
/** @file
Graphics Output Protocol functions for the QEMU video controller.
Copyright (c) 2007 - 2016, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
@ -189,30 +189,35 @@ Routine Description:
QemuVideoCompleteModeData (Private, This->Mode);
//
// Allocate when using first time.
// Re-initialize the frame buffer configure when mode changes.
//
if (Private->FrameBufferBltConfigure == NULL) {
Status = FrameBufferBltConfigure (
(VOID*) (UINTN) This->Mode->FrameBufferBase,
This->Mode->Info,
Private->FrameBufferBltConfigure,
&Private->FrameBufferBltConfigureSize
);
ASSERT (Status == RETURN_BUFFER_TOO_SMALL);
Status = FrameBufferBltConfigure (
(VOID*) (UINTN) This->Mode->FrameBufferBase,
This->Mode->Info,
Private->FrameBufferBltConfigure,
&Private->FrameBufferBltConfigureSize
);
if (Status == RETURN_BUFFER_TOO_SMALL) {
//
// Frame buffer configure may be larger in new mode.
//
if (Private->FrameBufferBltConfigure != NULL) {
FreePool (Private->FrameBufferBltConfigure);
}
Private->FrameBufferBltConfigure =
AllocatePool (Private->FrameBufferBltConfigureSize);
}
ASSERT (Private->FrameBufferBltConfigure != NULL);
//
// Create the configuration for FrameBufferBltLib
//
ASSERT (Private->FrameBufferBltConfigure != NULL);
Status = FrameBufferBltConfigure (
(VOID*) (UINTN) This->Mode->FrameBufferBase,
This->Mode->Info,
Private->FrameBufferBltConfigure,
&Private->FrameBufferBltConfigureSize
);
//
// Create the configuration for FrameBufferBltLib
//
Status = FrameBufferBltConfigure (
(VOID*) (UINTN) This->Mode->FrameBufferBase,
This->Mode->Info,
Private->FrameBufferBltConfigure,
&Private->FrameBufferBltConfigureSize
);
}
ASSERT (Status == RETURN_SUCCESS);
return EFI_SUCCESS;