2 files changed, 3 insertions, 72 deletions
diff --git a/src/mainboard/lenovo/x200/Kconfig b/src/mainboard/lenovo/x200/Kconfig
index 5f7f87ad1f..73ed75f700 100644
--- a/src/mainboard/lenovo/x200/Kconfig
+++ b/src/mainboard/lenovo/x200/Kconfig
@@ -19,6 +19,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select HAVE_ACPI_RESUME
 	select MAINBOARD_HAS_NATIVE_VGA_INIT
 	select MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG
+	select INTEL_INT15
 
 config MAINBOARD_DIR
 	string
diff --git a/src/mainboard/lenovo/x200/mainboard.c b/src/mainboard/lenovo/x200/mainboard.c
index c83ad70630..6c13eed84f 100644
--- a/src/mainboard/lenovo/x200/mainboard.c
+++ b/src/mainboard/lenovo/x200/mainboard.c
@@ -23,10 +23,7 @@
 //#include <pc80/mc146818rtc.h>
 #include <device/device.h>
 #include <console/console.h>
-#if CONFIG_VGA_ROM_RUN
-#include <arch/interrupt.h>
-#include <x86emu/x86emu.h>
-#endif
+#include <drivers/intel/gma/int15.h>
 #include <pc80/keyboard.h>
 #include <ec/acpi/ec.h>
 #include <smbios.h>
@@ -44,70 +41,6 @@
 			the overloaded weak function in there. */
 #endif
 
-
-#if CONFIG_VGA_ROM_RUN
-static int int15_handler(void)
-{
-	enum {
-		BOOT_DISPLAY_DEFAULT	 = 0,
-		BOOT_DISPLAY_CRT	 = (1 << 0),
-		BOOT_DISPLAY_TV		 = (1 << 1),
-		BOOT_DISPLAY_EFP	 = (1 << 2),
-		BOOT_DISPLAY_LFP	 = (1 << 3),
-		BOOT_DISPLAY_CRT2	 = (1 << 4),
-		BOOT_DISPLAY_TV2	 = (1 << 5),
-		BOOT_DISPLAY_EFP2	 = (1 << 6),
-		BOOT_DISPLAY_LFP2	 = (1 << 7),
-	};
-	enum {
-		PANEL_FIT_DEFAULT	= 0,
-		PANEL_FIT_CENTERING	= (1 << 0),
-		PANEL_FIT_TXT_STRETCH	= (1 << 1),
-		PANEL_FIT_GFX_STRETCH	= (1 << 2),
-	};
-
-	switch (X86_AX) {
-	case 0x5f34:
-		/* Set Panel Fitting Hook */
-		X86_AX = 0x005f;
-		X86_CX = PANEL_FIT_CENTERING;
-		break;
-	case 0x5f35:
-		/* Boot Display Device Hook */
-		X86_AX = 0x005f;
-		X86_CX = BOOT_DISPLAY_DEFAULT; /* Select automatically. */
-		break;
-	case 0x5f40:
-		/* Boot Panel Type Hook */
-		/* Contrary to what EMGD's user's guide says,
-		   this _alters_ the behavior of the Video BIOS. */
-		/* LCD panel type is SIO GPIO40-43.
-		   It's controlled by a DIP switch but was always
-		   set to 4 while only values of 5 and 6 worked. */
-		X86_AX = 0x005f;
-		X86_CX = 0x2;
-		break;
-	case 0x5f70:
-		/* Sandybridge boards return 0 here. */
-	case 0x5f14:
-	case 0x5f21:
-	case 0x5f22:
-	case 0x5f49:
-		/* No documentation found. */
-	default:
-		/* Interrupt was not handled. */
-		printk(BIOS_DEBUG,
-			"%s: AX=%04x BX=%04x CX=%04x DX=%04x\n", __func__,
-			X86_AX, X86_BX, X86_CX, X86_DX);
-		return 0;
-	}
-
-	/* Interrupt handled. */
-	return 1;
-}
-
-#endif
-
 static void verb_setup(void)
 {
 	cim_verb_data = mainboard_cim_verb_data;
@@ -136,10 +69,7 @@ static void mainboard_init(device_t dev)
 static void mainboard_enable(device_t dev)
 {
 	verb_setup();
-#if CONFIG_VGA_ROM_RUN
-	/* Install custom int15 handler for VGA OPROM */
-	mainboard_interrupt_handlers(0x15, &int15_handler);
-#endif
+	install_intel_vga_int15_handler(GMA_INT15_ACTIVE_LFP_INT_LVDS, GMA_INT15_PANEL_FIT_CENTERING, GMA_INT15_BOOT_DISPLAY_DEFAULT, 2);
 
 	dev->ops->init = mainboard_init;
 }