16027951 Xorg GUI fails to start when installing solaris 11.1 s11u2_13
authorTianjun Ye<tianjun.ye@oracle.com>
Tue, 09 Apr 2013 12:14:23 -0700
changeset 1342 7e6df6b08b70
parent 1341 44ecd7ebcb18
child 1343 7524f0d3236c
16027951 Xorg GUI fails to start when installing solaris 11.1
open-src/driver/xf86-video-ast/16027951.patch
open-src/driver/xf86-video-ast/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/driver/xf86-video-ast/16027951.patch	Tue Apr 09 12:14:23 2013 -0700
@@ -0,0 +1,39 @@
+--- src/ast_driver.c	Tue Mar 19 16:55:11 2013
++++ src/ast_driver.c	Mon Apr  1 16:10:19 2013
+@@ -1,5 +1,6 @@
+ /*
+  * Copyright (c) 2005 ASPEED Technology Inc.
++ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. 
+  *
+  * Permission to use, copy, modify, distribute, and sell this software and its
+  * documentation for any purpose is hereby granted without fee, provided that
+@@ -1398,7 +1399,13 @@
+            Flags = GetVGA2EDID(pScrn, DDC_data);
+        else
+            Flags = GetVGAEDID(pScrn, DDC_data);
+-       
++
++	/*
++	 * Buffer is of size 128, can't read extension blocks even the monitor
++	 * provides. 126 is NO_EDID defined in edid.h
++	 */
++	DDC_data[126] = 0;
++
+        if (Flags)    
+        {
+            ConfiguredMonitor = xf86InterpretEDID(pScrn->scrnIndex, DDC_data);
+@@ -1441,7 +1448,13 @@
+             Flags = GetVGA2EDID(pScrn, DDC_data);
+         else
+             Flags = GetVGAEDID(pScrn, DDC_data);
+-        
++
++	/*
++	 * Buffer is of size 128, can't read extension blocks even the monitor
++	 * provides. 126 is NO_EDID defined in edid.h
++	 */
++	DDC_data[126] = 0;	
++
+         if (Flags)
+         {
+ 	    MonInfo = MonInfo1 = xf86InterpretEDID(pScrn->scrnIndex, DDC_data);
--- a/open-src/driver/xf86-video-ast/Makefile	Tue Apr 02 16:59:51 2013 -0700
+++ b/open-src/driver/xf86-video-ast/Makefile	Tue Apr 09 12:14:23 2013 -0700
@@ -41,7 +41,8 @@
 SOURCE_PATCHES += sparc-ast.patch,-p1 \
 		  7164238.patch \
 		ast.patch \
-		ast_vgatool.patch
+		ast_vgatool.patch \
+		16027951.patch
 
 # Link in additional source files from sun-src directory
 ADDITIONAL_SOURCE_DIR=sun-src