Signed-off-by: Jonathan A. Kollasch jakllsch@kollasch.net --- src/system.c | 1 + src/util.h | 1 + src/vgahooks.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 67 insertions(+), 1 deletion(-)
diff --git a/src/system.c b/src/system.c index 3daf49b..5d10cc8 100644 --- a/src/system.c +++ b/src/system.c @@ -349,6 +349,7 @@ handle_15(struct bregs *regs) case 0x52: handle_1552(regs); break; case 0x53: handle_1553(regs); break; case 0x5f: handle_155f(regs); break; + case 0x7f: handle_157f(regs); break; case 0x83: handle_1583(regs); break; case 0x86: handle_1586(regs); break; case 0x87: handle_1587(regs); break; diff --git a/src/util.h b/src/util.h index d51e30f..c9d463d 100644 --- a/src/util.h +++ b/src/util.h @@ -218,6 +218,7 @@ void lpt_setup(void);
// vgahooks.c void handle_155f(struct bregs *regs); +void handle_157f(struct bregs *regs); void vgahook_setup(struct pci_device *pci);
diff --git a/src/vgahooks.c b/src/vgahooks.c index dc3085e..6a4acfe 100644 --- a/src/vgahooks.c +++ b/src/vgahooks.c @@ -12,10 +12,11 @@ #include "hw/pci_regs.h" // PCI_VENDOR_ID #include "output.h" // dprintf #include "string.h" // strcmp -#include "util.h" // handle_155f +#include "util.h" // handle_155f, handle_157f
#define VH_VIA 1 #define VH_INTEL 2 +#define VH_SMI 3
int VGAHookHandlerType VARFSEG;
@@ -25,6 +26,11 @@ handle_155fXX(struct bregs *regs) set_code_unimplemented(regs, RET_EUNSUPPORTED); }
+static void +handle_157fXX(struct bregs *regs) +{ + set_code_unimplemented(regs, RET_EUNSUPPORTED); +}
/**************************************************************** * Via hooks @@ -248,6 +254,46 @@ getac_setup(struct pci_device *pci) { }
+/**************************************************************** + * Silicon Motion hooks + ****************************************************************/ + +u8 SmiBootDisplay VARFSEG; // 1: LCD, 2: CRT, 3: Both */ + +static void +smi_157f02(struct bregs *regs) +{ + /* Boot Display Device Override */ + regs->ax = 0x007f; + regs->bl = GET_GLOBAL(SmiBootDisplay); + set_success(regs); +} + +static void +smi_157f14(struct bregs *regs) +{ + /* ReduceOn support default status */ + regs->ax = 0x007f; + regs->bl = 0x00; + set_success(regs); +} + +static void +smi_157f(struct bregs *regs) +{ + switch (regs->al) { + case 0x02: smi_157f02(regs); break; + case 0x14: smi_157f14(regs); break; + default: handle_157fXX(regs); break; + } +} + +static void +winent_mb6047_setup(struct pci_device *pci) +{ + VGAHookHandlerType = VH_SMI; + SmiBootDisplay = 0x02; +}
/**************************************************************** * Entry and setup @@ -270,6 +316,22 @@ handle_155f(struct bregs *regs) } }
+// Main 16bit entry point +void +handle_157f(struct bregs *regs) +{ + if (!CONFIG_VGAHOOKS) { + handle_157fXX(regs); + return; + } + + int htype = GET_GLOBAL(VGAHookHandlerType); + switch (htype) { + case VH_SMI: smi_157f(regs); break; + default: handle_157fXX(regs); break; + } +} + // Setup void vgahook_setup(struct pci_device *pci) @@ -283,6 +345,8 @@ vgahook_setup(struct pci_device *pci) getac_setup(pci); else if (strcmp(CBvendor, "RODA") == 0 && strcmp(CBpart, "RK886EX") == 0) roda_setup(pci); + else if (strcmp(CBvendor, "Win Enterprise") == 0 && strcmp(CBpart, "MB6047") == 0) + winent_mb6047_setup(pci); else if (pci->vendor == PCI_VENDOR_ID_VIA) via_setup(pci); else if (pci->vendor == PCI_VENDOR_ID_INTEL)
On Sat, Oct 19, 2013 at 10:36:39AM -0500, Jonathan A. Kollasch wrote:
Signed-off-by: Jonathan A. Kollasch jakllsch@kollasch.net
Thanks. Your patch looks okay to me. But, can you expand on the description - what users will benefit from the patch and what is the benefit?
-Kevin
On Sun, Oct 20, 2013 at 09:50:34AM -0400, Kevin O'Connor wrote:
On Sat, Oct 19, 2013 at 10:36:39AM -0500, Jonathan A. Kollasch wrote:
Signed-off-by: Jonathan A. Kollasch jakllsch@kollasch.net
Thanks. Your patch looks okay to me. But, can you expand on the description - what users will benefit from the patch and what is the benefit?
Benefits, for users with a SMI SM720 VGA BIOS, particularly on the MB-60470 are:
The SMI SM720 VGA BIOS won't turn on the CRT without smi_157f14().
smi_157f02() tells the VGA BIOS to configure output on the VGA CRT connector in the native mode, rather than a scaled-to-fit-panel mode.
While the MB-60470 has both VGA and LCD outputs, I've only been able to test with the VGA output.
Can I assume you want something like this in the commit message?
Jonathan Kollasch
On Sun, Oct 20, 2013 at 12:16:17PM -0500, Jonathan A. Kollasch wrote:
On Sun, Oct 20, 2013 at 09:50:34AM -0400, Kevin O'Connor wrote:
On Sat, Oct 19, 2013 at 10:36:39AM -0500, Jonathan A. Kollasch wrote:
Signed-off-by: Jonathan A. Kollasch jakllsch@kollasch.net
Thanks. Your patch looks okay to me. But, can you expand on the description - what users will benefit from the patch and what is the benefit?
Benefits, for users with a SMI SM720 VGA BIOS, particularly on the MB-60470 are:
The SMI SM720 VGA BIOS won't turn on the CRT without smi_157f14().
smi_157f02() tells the VGA BIOS to configure output on the VGA CRT connector in the native mode, rather than a scaled-to-fit-panel mode.
While the MB-60470 has both VGA and LCD outputs, I've only been able to test with the VGA output.
Can I assume you want something like this in the commit message?
Yes, thanks.
-Kevin
-
Jonathan A. Kollasch -
Kevin O'Connor