24696958 Xorg killed due to hardware error
authorJay Cotton <Jay.Cotton@Oracle.com>
Wed, 19 Oct 2016 20:11:20 -0700
changeset 1675 9bd813a73aa0
parent 1674 e2503e139dc0
child 1676 1bb1cbfed50c
24696958 Xorg killed due to hardware error
open-src/driver/xf86-video-ast/Makefile
open-src/driver/xf86-video-ast/sparc.patch
--- a/open-src/driver/xf86-video-ast/Makefile	Tue Oct 18 16:04:10 2016 -0700
+++ b/open-src/driver/xf86-video-ast/Makefile	Wed Oct 19 20:11:20 2016 -0700
@@ -39,6 +39,7 @@
 
 # Patches to apply to source after unpacking, in order
 SOURCE_PATCHES += sparc-ast.patch,-p1 \
+		sparc.patch,-p1 \
 		16027951.patch,-p1 \
 		17907916.patch,-p1 \
 		20816358-disable-DP501.patch,-p1 \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/driver/xf86-video-ast/sparc.patch	Wed Oct 19 20:11:20 2016 -0700
@@ -0,0 +1,35 @@
+--- a/src/ast_driver.c	2016-10-19 19:32:32.586151260 -0700
++++ b/src/ast_driver.c	2016-10-19 19:36:20.008810060 -0700
+@@ -665,7 +665,16 @@
+        /* Enable VGA MMIO Access */
+        vASTEnableVGAMMIO(pScrn);
+ #endif
++       /* Init VGA Adapter */
++       if (!xf86IsPrimaryPci(pAST->PciInfo))
++       {
++           ASTInitVGA(pScrn, 0);
++       }
+ 
++       vASTOpenKey(pScrn);
++       bASTRegInit(pScrn);
++
++
+        /* Get Chip Type */
+        if (PCI_DEV_REVISION(pAST->PciInfo) >= 0x40)
+            pAST->jChipType = AST2500;
+@@ -678,15 +687,6 @@
+        else
+            pAST->jChipType = AST2000;
+ 
+-       /* Init VGA Adapter */
+-       if (!xf86IsPrimaryPci(pAST->PciInfo))
+-       {
+-           ASTInitVGA(pScrn, 0);
+-       }
+-
+-       vASTOpenKey(pScrn);
+-       bASTRegInit(pScrn);
+-
+        /* Get Options from Scratch */
+        ASTGetScratchOptions(pScrn);
+