Sync patches r13538 and r13934 from main trunk.

1. To follow UEFI spec, update the code to make correct check to support multiple _ADR fields.
2. BiosVideo allocate wrong size of buffer for EDID override data. Fix this issue to allocate correct buffer size.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/branches/UDK2010.SR1@14070 6f19259b-4bc3-4df7-8a09-765794883524

IntelFrameworkModulePkg/Csm/BiosThunk/VideoDxe/BiosVideo.c

@@ -198,7 +198,7 @@ BiosVideoDriverBindingSupported (
         //
         if (Node->DevPath.Type != ACPI_DEVICE_PATH ||
             Node->DevPath.SubType != ACPI_ADR_DP ||
-            DevicePathNodeLength(&Node->DevPath) != sizeof(ACPI_ADR_DEVICE_PATH)) {
+            DevicePathNodeLength(&Node->DevPath) < sizeof(ACPI_ADR_DEVICE_PATH)) {
           Status = EFI_UNSUPPORTED;
         }
       }
@@ -1374,7 +1374,7 @@ BiosVideoCheckForVbe (
     //
     // Allocate double size of VESA_BIOS_EXTENSIONS_EDID_BLOCK_SIZE to avoid overflow
     //
-    EdidOverrideDataBlock = AllocatePool (sizeof (VESA_BIOS_EXTENSIONS_EDID_BLOCK_SIZE * 2));
+    EdidOverrideDataBlock = AllocatePool (VESA_BIOS_EXTENSIONS_EDID_BLOCK_SIZE * 2);
     if (NULL == EdidOverrideDataBlock) {
   		Status = EFI_OUT_OF_RESOURCES;
       goto Done;