486N/A--- a/src/ast_vgatool.c Wed Nov 12 12:52:46 2014

486N/A+++ b/src/ast_vgatool.c Wed Nov 12 12:53:51 2014

486N/A@@ -1076,16 +1076,29 @@

486N/A static void vEnableVGA(ScrnInfoPtr pScrn)

486N/A {

486N/A ASTRecPtr pAST;

486N/A+ UCHAR miscout;

486N/A

486N/A pAST = ASTPTR(pScrn);

486N/A

486N/A SetReg(VGA_ENABLE_PORT, 0x01);

486N/A- SetReg(MISC_PORT_WRITE, 0x01);

486N/A+ /*

486N/A+ * Only set the Input/Output Address bit in the Miscellaneous

486N/A+ * output register, as clearing others bits and accessing the

486N/A+ * frame buffer caused non-resumable errors on sparc.

486N/A+ */

486N/A

486N/A+ miscout = GetReg(MISC_PORT_READ);

486N/A+ SetReg(MISC_PORT_WRITE, miscout | 0x01);

486N/A }

486N/A

486N/A+/*

486N/A+ * Leave video memory enabled in PCI Control Register #1 (0xa0), as

486N/A+ * accessing the frame buffer with it disabled caused non-resumable

486N/A+ * errors on sparc.

486N/A+ */

486N/A+

486N/A static UCHAR ExtRegInfo[] = {

486N/A- 0x0F,

486N/A+ 0x7F,

486N/A 0x04,

486N/A 0x1C,

486N/A 0xFF

486N/A@@ -1092,7 +1105,7 @@

493N/A };

486N/A

486N/A static UCHAR ExtRegInfo_AST2300A0[] = {

493N/A- 0x0F,

486N/A+ 0x7F,

486N/A 0x04,

486N/A 0x1C,

486N/A 0xFF

486N/A@@ -1099,7 +1112,7 @@

486N/A };

486N/A

493N/A static UCHAR ExtRegInfo_AST2300[] = {

493N/A- 0x0F,

493N/A+ 0x7F,

493N/A 0x04,

486N/A 0x1F,

486N/A 0xFF

486N/A