From a3fe2d78f3c175906bd9d464884394b184fa4777 Mon Sep 17 00:00:00 2001
From: Jan Beulich <jbeulich@suse.com>
Date: Thu, 9 Feb 2012 11:33:51 +0800
Subject: [PATCH] --- yaml --- r: 329183 b: refs/heads/master c:
 aa387d630cfed1a694a9c8c61fba3877ba8d4f07 h: refs/heads/master i:   329181:
 f042168163a2859565dfc58f5fd4dd1d82e5e329   329179:
 e1715e5220d6fba0b28491d299f34b7f53c5883e   329175:
 ff15edef86fd6202c8242c4b7e6a190cecc6e57b   329167:
 2d6896b121264a45684ec9379890c86b67a79717   329151:
 606457099a24eff782c0d910547837acc827b116 v: v3

---
 [refs]                            | 2 +-
 trunk/arch/x86/xen/vga.c          | 7 +++++++
 trunk/include/xen/interface/xen.h | 1 +
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 428cfbf08ce3..046a138e3264 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ffb8b233c2261b7978dc3bd759aaa19bd1a7fadf
+refs/heads/master: aa387d630cfed1a694a9c8c61fba3877ba8d4f07
diff --git a/trunk/arch/x86/xen/vga.c b/trunk/arch/x86/xen/vga.c
index 1cd7f4d11e29..6722e3733f02 100644
--- a/trunk/arch/x86/xen/vga.c
+++ b/trunk/arch/x86/xen/vga.c
@@ -35,6 +35,7 @@ void __init xen_init_vga(const struct dom0_vga_console_info *info, size_t size)
 			info->u.text_mode_3.font_height;
 		break;
 
+	case XEN_VGATYPE_EFI_LFB:
 	case XEN_VGATYPE_VESA_LFB:
 		if (size < offsetof(struct dom0_vga_console_info,
 				    u.vesa_lfb.gbl_caps))
@@ -54,6 +55,12 @@ void __init xen_init_vga(const struct dom0_vga_console_info *info, size_t size)
 		screen_info->blue_pos = info->u.vesa_lfb.blue_pos;
 		screen_info->rsvd_size = info->u.vesa_lfb.rsvd_size;
 		screen_info->rsvd_pos = info->u.vesa_lfb.rsvd_pos;
+
+		if (info->video_type == XEN_VGATYPE_EFI_LFB) {
+			screen_info->orig_video_isVGA = VIDEO_TYPE_EFI;
+			break;
+		}
+
 		if (size >= offsetof(struct dom0_vga_console_info,
 				     u.vesa_lfb.gbl_caps)
 		    + sizeof(info->u.vesa_lfb.gbl_caps))
diff --git a/trunk/include/xen/interface/xen.h b/trunk/include/xen/interface/xen.h
index 1e0df6b7d3b3..886a5d80a18f 100644
--- a/trunk/include/xen/interface/xen.h
+++ b/trunk/include/xen/interface/xen.h
@@ -454,6 +454,7 @@ struct dom0_vga_console_info {
 	uint8_t video_type;
 #define XEN_VGATYPE_TEXT_MODE_3 0x03
 #define XEN_VGATYPE_VESA_LFB    0x23
+#define XEN_VGATYPE_EFI_LFB     0x70
 
 	union {
 		struct {