943N/A# Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.

606N/A#

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

919N/A# copy of this software and associated documentation files (the "Software"),

919N/A# to deal in the Software without restriction, including without limitation

919N/A# the rights to use, copy, modify, merge, publish, distribute, sublicense,

919N/A# and/or sell copies of the Software, and to permit persons to whom the

919N/A# Software is furnished to do so, subject to the following conditions:

919N/A#

919N/A# The above copyright notice and this permission notice (including the next

919N/A# paragraph) shall be included in all copies or substantial portions of the

919N/A# Software.

919N/A#

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

919N/A# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

919N/A# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

919N/A# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

919N/A# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

919N/A# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

919N/A# DEALINGS IN THE SOFTWARE.

606N/A#

606N/A

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

606N/A

1124N/Adiff --git a/src/aticonsole.c b/src/aticonsole.c

1124N/Aindex 50cc6e1..947a122 100644

1124N/A--- a/src/aticonsole.c

1124N/A+++ b/src/aticonsole.c

1124N/A@@ -515,6 +515,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;