606N/A# Copyright 2009 Sun Microsystems, Inc. All rights reserved.

606N/A# Use subject to license terms.

606N/A#

606N/A# Permission is hereby granted, free of charge, to any person obtaining a

606N/A# copy of this software and associated documentation files (the

606N/A# "Software"), to deal in the Software without restriction, including

606N/A# without limitation the rights to use, copy, modify, merge, publish,

606N/A# distribute, and/or sell copies of the Software, and to permit persons

606N/A# to whom the Software is furnished to do so, provided that the above

606N/A# copyright notice(s) and this permission notice appear in all copies of

606N/A# the Software and that both the above copyright notice(s) and this

606N/A# permission notice appear in supporting documentation.

606N/A#

606N/A# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

606N/A# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

606N/A# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

606N/A# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

606N/A# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

606N/A# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

606N/A# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

606N/A# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

606N/A# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

606N/A#

606N/A# Except as contained in this notice, the name of a copyright holder

606N/A# shall not be used in advertising or otherwise to promote the sale, use

606N/A# or other dealings in this Software without prior written authorization

606N/A# of the copyright holder.

606N/A#

606N/A

606N/AChange needed to resume from S3 suspend on Rage XL chipset in Ultra 20.

606N/A

606N/Adiff -urp -x '*~' -x '*.orig' src/aticonsole.c src/aticonsole.c

606N/A--- src/aticonsole.c 2008-03-25 23:09:43.000000000 -0700

606N/A+++ src/aticonsole.c 2009-01-12 18:24:36.680149000 -0800

606N/A@@ -514,6 +514,16 @@ ATIEnterGraphics

98N/A ATIPtr pATI

98N/A )

98N/A {

606N/A+ CARD32 PciReg;

606N/A+ pciVideoPtr pVideo = pATI->PCIInfo;

98N/A+

98N/A+/*

98N/A+* Possibly fix block I/O indicator in PCI configuration space.

98N/A+*/

606N/A+ PCI_READ_LONG(pVideo, &PciReg, PCI_REG_USERCONFIG);

98N/A+ if (!(PciReg & 0x00000004U))

606N/A+ PCI_WRITE_LONG(pVideo, (PciReg | 0x00000004U), PCI_REG_USERCONFIG);

98N/A+

98N/A /* Map apertures */

98N/A if (!ATIMapApertures(pScreenInfo->scrnIndex, pATI))

98N/A return FALSE;