Mercurial Mercurial > upstream > oracle > x-cons > x-s11-update-clone / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
open-src/driver/xf86-video-ast/6924667.patch
author Niveditha Rau <Niveditha.Rau@Sun.COM>
Mon, 15 Feb 2010 16:34:06 -0800
changeset 903 c6b29bba4433
child 999 c88b52baf4f4
permissions -rw-r--r--
6924667 "Xorg -configure" core dump on Ultra45 - X_133
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
903
c6b29bba4433 6924667 "Xorg -configure" core dump on Ultra45 - X_133
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff changeset 
     1
 
--- src/ast_driver.c	Mon Feb 15 14:36:59 2010
c6b29bba4433 6924667 "Xorg -configure" core dump on Ultra45 - X_133
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff changeset 
     2
 
+++ src/ast_driver.c	Mon Feb 15 14:46:07 2010
c6b29bba4433 6924667 "Xorg -configure" core dump on Ultra45 - X_133
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff changeset 
     3
 
@@ -404,28 +404,32 @@
c6b29bba4433 6924667 "Xorg -configure" core dump on Ultra45 - X_133
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff changeset 
     4
 
     xfree(usedChips);
c6b29bba4433 6924667 "Xorg -configure" core dump on Ultra45 - X_133
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff changeset 
     5
 
 #else
c6b29bba4433 6924667 "Xorg -configure" core dump on Ultra45 - X_133
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff changeset 
     6
c6b29bba4433 6924667 "Xorg -configure" core dump on Ultra45 - X_133
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff changeset 
     7
 
-    for (i = 0; i < numDevSections; i++) {
c6b29bba4433 6924667 "Xorg -configure" core dump on Ultra45 - X_133
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff changeset 
     8
 
+    if (flags & PROBE_DETECT) {
c6b29bba4433 6924667 "Xorg -configure" core dump on Ultra45 - X_133
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff changeset 
     9
 
+        foundScreen = TRUE;
c6b29bba4433 6924667 "Xorg -configure" core dump on Ultra45 - X_133
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff changeset 
    10
 
+    } else {
c6b29bba4433 6924667 "Xorg -configure" core dump on Ultra45 - X_133
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff changeset 
    11
 
+        for (i = 0; i < numDevSections; i++) {
c6b29bba4433 6924667 "Xorg -configure" core dump on Ultra45 - X_133
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff changeset 
    12
c6b29bba4433 6924667 "Xorg -configure" core dump on Ultra45 - X_133
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff changeset 
    13
 
-	ScrnInfoPtr pScrn = NULL;
c6b29bba4433 6924667 "Xorg -configure" core dump on Ultra45 - X_133
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff changeset 
    14
 
+		ScrnInfoPtr pScrn = NULL;
c6b29bba4433 6924667 "Xorg -configure" core dump on Ultra45 - X_133
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff changeset 
    15
c6b29bba4433 6924667 "Xorg -configure" core dump on Ultra45 - X_133
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff changeset 
    16
 
-	/* Allocate new ScrnInfoRec and claim the slot */
c6b29bba4433 6924667 "Xorg -configure" core dump on Ultra45 - X_133
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff changeset 
    17
 
-	if (pScrn = ASTAllocScreen(drv, devSections[i])) {
c6b29bba4433 6924667 "Xorg -configure" core dump on Ultra45 - X_133
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff changeset 
    18
 
-	    pScrn->driverVersion = AST_VERSION;
c6b29bba4433 6924667 "Xorg -configure" core dump on Ultra45 - X_133
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff changeset 
    19
 
-	    pScrn->driverName = AST_DRIVER_NAME;
c6b29bba4433 6924667 "Xorg -configure" core dump on Ultra45 - X_133
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff changeset 
    20
 
-	    pScrn->name = AST_NAME;
c6b29bba4433 6924667 "Xorg -configure" core dump on Ultra45 - X_133
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff changeset 
    21
 
+		/* Allocate new ScrnInfoRec and claim the slot */
c6b29bba4433 6924667 "Xorg -configure" core dump on Ultra45 - X_133
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff changeset 
    22
 
+		if (pScrn = ASTAllocScreen(drv, devSections[i])) {
c6b29bba4433 6924667 "Xorg -configure" core dump on Ultra45 - X_133
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff changeset 
    23
 
+	    	    pScrn->driverVersion = AST_VERSION;
c6b29bba4433 6924667 "Xorg -configure" core dump on Ultra45 - X_133
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff changeset 
    24
 
+	    	    pScrn->driverName = AST_DRIVER_NAME;
c6b29bba4433 6924667 "Xorg -configure" core dump on Ultra45 - X_133
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff changeset 
    25
 
+	    	    pScrn->name = AST_NAME;
c6b29bba4433 6924667 "Xorg -configure" core dump on Ultra45 - X_133
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff changeset 
    26
c6b29bba4433 6924667 "Xorg -configure" core dump on Ultra45 - X_133
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff changeset 
    27
 
-	    pScrn->Probe = ASTProbe;
c6b29bba4433 6924667 "Xorg -configure" core dump on Ultra45 - X_133
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff changeset 
    28
 
-	    pScrn->PreInit = ASTPreInit;
c6b29bba4433 6924667 "Xorg -configure" core dump on Ultra45 - X_133
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff changeset 
    29
 
-	    pScrn->ScreenInit = ASTScreenInit;
c6b29bba4433 6924667 "Xorg -configure" core dump on Ultra45 - X_133
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff changeset 
    30
 
-	    pScrn->SwitchMode = ASTSwitchMode;
c6b29bba4433 6924667 "Xorg -configure" core dump on Ultra45 - X_133
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff changeset 
    31
 
-	    pScrn->AdjustFrame = ASTAdjustFrame;
c6b29bba4433 6924667 "Xorg -configure" core dump on Ultra45 - X_133
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff changeset 
    32
 
-	    pScrn->EnterVT = ASTEnterVT;
c6b29bba4433 6924667 "Xorg -configure" core dump on Ultra45 - X_133
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff changeset 
    33
 
-	    pScrn->LeaveVT = ASTLeaveVT;
c6b29bba4433 6924667 "Xorg -configure" core dump on Ultra45 - X_133
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff changeset 
    34
 
-	    pScrn->FreeScreen = ASTFreeScreen;
c6b29bba4433 6924667 "Xorg -configure" core dump on Ultra45 - X_133
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff changeset 
    35
 
-	    pScrn->ValidMode = ASTValidMode;
c6b29bba4433 6924667 "Xorg -configure" core dump on Ultra45 - X_133
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff changeset 
    36
 
+	    	    pScrn->Probe = ASTProbe;
c6b29bba4433 6924667 "Xorg -configure" core dump on Ultra45 - X_133
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff changeset 
    37
 
+	    	    pScrn->PreInit = ASTPreInit;
c6b29bba4433 6924667 "Xorg -configure" core dump on Ultra45 - X_133
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff changeset 
    38
 
+	    	    pScrn->ScreenInit = ASTScreenInit;
c6b29bba4433 6924667 "Xorg -configure" core dump on Ultra45 - X_133
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff changeset 
    39
 
+	    	    pScrn->SwitchMode = ASTSwitchMode;
c6b29bba4433 6924667 "Xorg -configure" core dump on Ultra45 - X_133
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff changeset 
    40
 
+	    	    pScrn->AdjustFrame = ASTAdjustFrame;
c6b29bba4433 6924667 "Xorg -configure" core dump on Ultra45 - X_133
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff changeset 
    41
 
+	    	    pScrn->EnterVT = ASTEnterVT;
c6b29bba4433 6924667 "Xorg -configure" core dump on Ultra45 - X_133
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff changeset 
    42
 
+	    	    pScrn->LeaveVT = ASTLeaveVT;
c6b29bba4433 6924667 "Xorg -configure" core dump on Ultra45 - X_133
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff changeset 
    43
 
+	    	    pScrn->FreeScreen = ASTFreeScreen;
c6b29bba4433 6924667 "Xorg -configure" core dump on Ultra45 - X_133
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff changeset 
    44
 
+	    	    pScrn->ValidMode = ASTValidMode;
c6b29bba4433 6924667 "Xorg -configure" core dump on Ultra45 - X_133
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff changeset 
    45
c6b29bba4433 6924667 "Xorg -configure" core dump on Ultra45 - X_133
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff changeset 
    46
 
-	    foundScreen = TRUE;
c6b29bba4433 6924667 "Xorg -configure" core dump on Ultra45 - X_133
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff changeset 
    47
 
-	}
c6b29bba4433 6924667 "Xorg -configure" core dump on Ultra45 - X_133
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff changeset 
    48
 
+	    	    foundScreen = TRUE;
c6b29bba4433 6924667 "Xorg -configure" core dump on Ultra45 - X_133
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff changeset 
    49
 
+		}
c6b29bba4433 6924667 "Xorg -configure" core dump on Ultra45 - X_133
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff changeset 
    50
 
+    	}
c6b29bba4433 6924667 "Xorg -configure" core dump on Ultra45 - X_133
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff changeset 
    51
 
     }
c6b29bba4433 6924667 "Xorg -configure" core dump on Ultra45 - X_133
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff changeset 
    52
 
     xfree(devSections);
c6b29bba4433 6924667 "Xorg -configure" core dump on Ultra45 - X_133
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff changeset 
    53
 
 #endif
upstream/oracle/x-cons/x-s11-update-clone