# HG changeset patch
# User henryzh <henry.zhao@oracle.com>
# Date 1363137141 25200
# Node ID 29d137f36350fc652f08556b81bba3723a9d97cc
# Parent  49256774ae10a2bbf8c5f5858215e8fd8caafe7e
16027951 Xorg GUI fails to start when installing solaris 11.1

diff -r 49256774ae10 -r 29d137f36350 open-src/driver/xf86-video-ast/16027951.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/driver/xf86-video-ast/16027951.patch	Tue Mar 12 18:12:21 2013 -0700
@@ -0,0 +1,35 @@
+--- a/src/ast_driver.c	Fri Mar  8 18:30:24 2013
++++ b/src/ast_driver.c	Fri Mar  8 18:24:44 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
+@@ -1484,6 +1485,12 @@
+       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);
+@@ -1528,6 +1535,12 @@
+       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);
diff -r 49256774ae10 -r 29d137f36350 open-src/driver/xf86-video-ast/Makefile
--- a/open-src/driver/xf86-video-ast/Makefile	Thu Feb 28 16:46:10 2013 -0800
+++ b/open-src/driver/xf86-video-ast/Makefile	Tue Mar 12 18:12:21 2013 -0700
@@ -38,7 +38,8 @@
 TARBALL_SHA256= 28fcd4781676485293f6dcd46e0797866f6219e22e1851c9796b037589998e76
 
 # Patches to apply to source after unpacking, in order
-SOURCE_PATCHES += sparc-ast.patch,-p1
+SOURCE_PATCHES += sparc-ast.patch,-p1 \
+		16027951.patch,-p1
 
 # Link in additional source files from sun-src directory
 ADDITIONAL_SOURCE_DIR=sun-src