98N/A--- src/ast_vgatool.c Wed Feb 12 18:36:02 2014

98N/A+++ src/ast_vgatool.c Wed Feb 12 18:33:31 2014

98N/A@@ -650,16 +650,31 @@

98N/A void vEnableVGA(ScrnInfoPtr pScrn)

98N/A {

98N/A ASTRecPtr pAST;

98N/A+ UCHAR miscout;

98N/A

98N/A pAST = ASTPTR(pScrn);

98N/A

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

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

98N/A+

98N/A+ /*

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

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

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

98N/A+ */

98N/A+

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

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

98N/A

98N/A }

98N/A

98N/A+/*

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

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

98N/A+ * errors on sparc.

98N/A+ */

98N/A+

98N/A UCHAR ExtRegInfo[] = {

98N/A- 0x0F,

235N/A+ 0x7F,

98N/A 0x04,

98N/A 0x1C,

235N/A 0xFF

156N/A@@ -666,7 +681,7 @@

156N/A };

156N/A

156N/A UCHAR ExtRegInfo_AST2300A0[] = {

98N/A- 0x0F,

98N/A+ 0x7F,

98N/A 0x04,

98N/A 0x1C,

235N/A 0xFF

235N/A@@ -673,7 +688,7 @@

98N/A };

98N/A

98N/A UCHAR ExtRegInfo_AST2300[] = {

156N/A- 0x0F,

98N/A+ 0x7F,

98N/A 0x04,

235N/A 0x1F,

235N/A 0xFF

98N/A