summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvanjeff <vanjeff@6f19259b-4bc3-4df7-8a09-765794883524>2013-05-10 06:46:20 +0000
committervanjeff <vanjeff@6f19259b-4bc3-4df7-8a09-765794883524>2013-05-10 06:46:20 +0000
commit212e027c54dac6b6219718415c11b291ae20bb67 (patch)
treefc7964872ab4594452089b78614eb707df3cd86e
parentf6537bea5dd59e55db6a75f3bfc64c34b74f7e34 (diff)
downloadedk2-212e027c54dac6b6219718415c11b291ae20bb67.zip
edk2-212e027c54dac6b6219718415c11b291ae20bb67.tar.gz
edk2-212e027c54dac6b6219718415c11b291ae20bb67.tar.bz2
Sync patch r14335 from main trunk.
Check if video device exists before trying to install Video OpROM. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/branches/UDK2010.SR1@14340 6f19259b-4bc3-4df7-8a09-765794883524
-rw-r--r--IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyPci.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyPci.c b/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyPci.c
index 62d0fee..fd5641a 100644
--- a/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyPci.c
+++ b/IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyPci.c
@@ -2914,7 +2914,15 @@ LegacyBiosInstallPciRom (
return EFI_UNSUPPORTED;
}
- if (!Private->VgaInstalled) {
+ Status = Private->LegacyBiosPlatform->GetPlatformHandle (
+ Private->LegacyBiosPlatform,
+ EfiGetPlatformVgaHandle,
+ 0,
+ &HandleBuffer,
+ &HandleCount,
+ NULL
+ );
+ if ((!EFI_ERROR (Status)) && (!Private->VgaInstalled)) {
//
// A return status of EFI_NOT_FOUND is considered valid (No EFI
// driver is controlling video.