# HG changeset patch
# User Niveditha Rau <Niveditha.Rau@Sun.COM>
# Date 1266280446 28800
# Node ID c6b29bba4433ce205d685f74a15b9b00fe8a42ac
# Parent  5294138f85debd7e57691f9c7e9bb1926ac28174
6924667 "Xorg -configure" core dump on Ultra45 - X_133

diff -r 5294138f85de -r c6b29bba4433 open-src/driver/xf86-video-ast/6924667.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/driver/xf86-video-ast/6924667.patch	Mon Feb 15 16:34:06 2010 -0800
@@ -0,0 +1,53 @@
+--- src/ast_driver.c	Mon Feb 15 14:36:59 2010
++++ src/ast_driver.c	Mon Feb 15 14:46:07 2010
+@@ -404,28 +404,32 @@
+     xfree(usedChips);
+ #else
+ 
+-    for (i = 0; i < numDevSections; i++) {
++    if (flags & PROBE_DETECT) {
++        foundScreen = TRUE;
++    } else {
++        for (i = 0; i < numDevSections; i++) {
+ 
+-	ScrnInfoPtr pScrn = NULL;
++		ScrnInfoPtr pScrn = NULL;
+ 	
+-	/* Allocate new ScrnInfoRec and claim the slot */
+-	if (pScrn = ASTAllocScreen(drv, devSections[i])) {
+-	    pScrn->driverVersion = AST_VERSION;
+-	    pScrn->driverName = AST_DRIVER_NAME;
+-	    pScrn->name = AST_NAME;
++		/* Allocate new ScrnInfoRec and claim the slot */
++		if (pScrn = ASTAllocScreen(drv, devSections[i])) {
++	    	    pScrn->driverVersion = AST_VERSION;
++	    	    pScrn->driverName = AST_DRIVER_NAME;
++	    	    pScrn->name = AST_NAME;
+ 	    
+-	    pScrn->Probe = ASTProbe;
+-	    pScrn->PreInit = ASTPreInit;
+-	    pScrn->ScreenInit = ASTScreenInit;
+-	    pScrn->SwitchMode = ASTSwitchMode;
+-	    pScrn->AdjustFrame = ASTAdjustFrame;   
+-	    pScrn->EnterVT = ASTEnterVT;
+-	    pScrn->LeaveVT = ASTLeaveVT;
+-	    pScrn->FreeScreen = ASTFreeScreen;
+-	    pScrn->ValidMode = ASTValidMode;
++	    	    pScrn->Probe = ASTProbe;
++	    	    pScrn->PreInit = ASTPreInit;
++	    	    pScrn->ScreenInit = ASTScreenInit;
++	    	    pScrn->SwitchMode = ASTSwitchMode;
++	    	    pScrn->AdjustFrame = ASTAdjustFrame;   
++	    	    pScrn->EnterVT = ASTEnterVT;
++	    	    pScrn->LeaveVT = ASTLeaveVT;
++	    	    pScrn->FreeScreen = ASTFreeScreen;
++	    	    pScrn->ValidMode = ASTValidMode;
+ 	    
+-	    foundScreen = TRUE;	    
+-	}
++	    	    foundScreen = TRUE;	    
++		}
++    	}
+     }
+     xfree(devSections);
+ #endif
diff -r 5294138f85de -r c6b29bba4433 open-src/driver/xf86-video-ast/Makefile
--- a/open-src/driver/xf86-video-ast/Makefile	Mon Feb 15 13:52:29 2010 -0800
+++ b/open-src/driver/xf86-video-ast/Makefile	Mon Feb 15 16:34:06 2010 -0800
@@ -2,7 +2,7 @@
 #
 # xf86-video-ast 1.x Makefile
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
@@ -30,7 +30,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# ident	"@(#)Makefile	1.14	09/12/05 SMI"
+# ident	"@(#)Makefile	1.16	10/02/15 SMI"
 #
 
 # Package name used in tarballs
@@ -44,7 +44,7 @@
 		xf86UDelay.patch,-p1 \
 		sparc-ast.patch \
 		sparc-ast-6860461.patch \
-		port.patch
+		6924667.patch port.patch
 
 # Link in additional source files from sun-src directory
 ADDITIONAL_SOURCE_DIR=sun-src