Consolidate intel vga int15 hooks

Change-Id: I9366dded98bf15f6da44ce893dd10698ba09fd55
Signed-off-by: Vladimir Serbinenko <phcoder@gmail.com>
Reviewed-on: http://review.coreboot.org/6820
Tested-by: build bot (Jenkins)
Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>

4 files changed, 12 insertions, 127 deletions

diff --git a/src/mainboard/roda/rk886ex/Kconfig b/src/mainboard/roda/rk886ex/Kconfig
index 7f2b5b914a..bbb5d9ba06 100644
--- a/src/mainboard/roda/rk886ex/Kconfig
+++ b/src/mainboard/roda/rk886ex/Kconfig
@@ -17,6 +17,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select HAVE_ACPI_RESUME
 	select BOARD_ROMSIZE_KB_1024
 	select CHANNEL_XOR_RANDOMIZATION
+	select INTEL_INT15
 
 config MAINBOARD_DIR
 	string
diff --git a/src/mainboard/roda/rk886ex/mainboard.c b/src/mainboard/roda/rk886ex/mainboard.c
index 7158dca300..ba7ed230c5 100644
--- a/src/mainboard/roda/rk886ex/mainboard.c
+++ b/src/mainboard/roda/rk886ex/mainboard.c
@@ -24,9 +24,7 @@
 #include <arch/io.h>
 #include <arch/interrupt.h>
 #include <delay.h>
-#if CONFIG_VGA_ROM_RUN
-#include <x86emu/x86emu.h>
-#endif
+#include <drivers/intel/gma/int15.h>
 
 #include <ec/acpi/ec.h>
 #include "m3885.h"
@@ -50,54 +48,6 @@ static void backlight_enable(void)
 	printk(BIOS_DEBUG, "Display I/O: 0x%02x\n", inb(0x60f));
 }
 
-#define BOOT_DISPLAY_DEFAULT	0
-#define BOOT_DISPLAY_CRT	(1 << 0)
-#define BOOT_DISPLAY_TV		(1 << 1)
-#define BOOT_DISPLAY_EFP	(1 << 2)
-#define BOOT_DISPLAY_LCD	(1 << 3)
-#define BOOT_DISPLAY_CRT2	(1 << 4)
-#define BOOT_DISPLAY_TV2	(1 << 5)
-#define BOOT_DISPLAY_EFP2	(1 << 6)
-#define BOOT_DISPLAY_LCD2	(1 << 7)
-
-#if CONFIG_VGA_ROM_RUN
-static int int15_handler(void)
-{
-	/* This int15 handler is Intel IGD. specific. Other chipsets need other
-	 * handlers. The right way to do this is to move this handler code into
-	 * the mainboard or northbridge code.
-	 * TODO: completely move to mainboards / chipsets.
-	 */
-	u8 display_id;
-
-	printk(BIOS_DEBUG, "%s: AX=%04x BX=%04x CX=%04x DX=%04x\n",
-			  __func__, X86_AX, X86_BX, X86_CX, X86_DX);
-
-	switch (X86_AX) {
-	case 0x5f35: /* Boot Display */
-		X86_AX = 0x005f; // Success
-		X86_CL = BOOT_DISPLAY_DEFAULT;
-		break;
-	case 0x5f40: /* Boot Panel Type */
-		/* LCD panel type is SIO GPIO40-43 */
-		// display_id = inb(0x60f) & 0x0f;
-		display_id = 3;
-		// M.x86.R_AX = 0x015f; // Supported but failed
-		X86_AX = 0x005f; // Success
-		X86_CL = display_id;
-		printk(BIOS_DEBUG, "DISPLAY=%x\n", X86_CL);
-		break;
-	default:
-		/* Interrupt was not handled */
-		printk(BIOS_DEBUG, "Unknown INT15 function %04x!\n", X86_AX);
-		return 0;
-	}
-
-	/* Interrupt handled */
-	return 1;
-}
-#endif
-
 #if DUMP_RUNTIME_REGISTERS
 static void dump_runtime_registers(void)
 {
@@ -124,10 +74,10 @@ static void mainboard_enable(device_t dev)
 	/* Disable Dummy DCC -> GP45 = 1 */
 	outb(inb(0x60f) | (1 << 5), 0x60f);
 
-#if CONFIG_VGA_ROM_RUN
-	/* Install custom int15 handler for VGA OPROM */
-	mainboard_interrupt_handlers(0x15, &int15_handler);
-#endif
+	/* LCD panel type is SIO GPIO40-43 */
+	// display_id = inb(0x60f) & 0x0f;
+	install_intel_vga_int15_handler(GMA_INT15_ACTIVE_LFP_INT_LVDS, GMA_INT15_PANEL_FIT_DEFAULT, GMA_INT15_BOOT_DISPLAY_DEFAULT, 3);
+
 #if DUMP_RUNTIME_REGISTERS
 	dump_runtime_registers();
 #endif
diff --git a/src/mainboard/roda/rk9/Kconfig b/src/mainboard/roda/rk9/Kconfig
index 6ed85ff3b4..271b0e4914 100644
--- a/src/mainboard/roda/rk9/Kconfig
+++ b/src/mainboard/roda/rk9/Kconfig
@@ -13,6 +13,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select HAVE_ACPI_TABLES
 	select EC_ACPI
 	select HAVE_OPTION_TABLE
+	select INTEL_INT15
 
 config MAINBOARD_DIR
 	string
diff --git a/src/mainboard/roda/rk9/mainboard.c b/src/mainboard/roda/rk9/mainboard.c
index 47444153f3..49db15f2e4 100644
--- a/src/mainboard/roda/rk9/mainboard.c
+++ b/src/mainboard/roda/rk9/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 <device/azalia_device.h>
@@ -37,70 +34,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 = (inb(0x60f) & 0x0f) + 1;
-		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;
@@ -127,10 +60,10 @@ static void mainboard_enable(device_t dev)
 {
 	ec_setup();
 	verb_setup();
-#if CONFIG_VGA_ROM_RUN
-	/* Install custom int15 handler for VGA OPROM */
-	mainboard_interrupt_handlers(0x15, &int15_handler);
-#endif
+	/* 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. */
+	install_intel_vga_int15_handler(GMA_INT15_ACTIVE_LFP_INT_LVDS, GMA_INT15_PANEL_FIT_CENTERING, GMA_INT15_BOOT_DISPLAY_DEFAULT, (inb(0x60f) & 0x0f) + 1);
 
 	/* We have no driver for the embedded controller since the firmware
 	   does most of the job. Hence, initialize keyboards here. */