components/x11/xf86-video-mach64/patches/01.6205248.patch

   1 # Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
   2 #
   3 # Permission is hereby granted, free of charge, to any person obtaining a
   4 # copy of this software and associated documentation files (the "Software"),
   5 # to deal in the Software without restriction, including without limitation
   6 # the rights to use, copy, modify, merge, publish, distribute, sublicense,
   7 # and/or sell copies of the Software, and to permit persons to whom the
   8 # Software is furnished to do so, subject to the following conditions:
   9 #
  10 # The above copyright notice and this permission notice (including the next
  11 # paragraph) shall be included in all copies or substantial portions of the
  12 # Software.
  13 #
  14 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  15 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  16 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
  17 # THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  18 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  19 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  20 # DEALINGS IN THE SOFTWARE.
  21 #
  22
  23 Change needed to resume from S3 suspend on Rage XL chipset in Ultra 20.
  24 https://bugs.freedesktop.org/show_bug.cgi?id=6829
  25
  26 diff --git a/src/aticonsole.c b/src/aticonsole.c
  27 index 50cc6e1..947a122 100644
  28 --- a/src/aticonsole.c
  29 +++ b/src/aticonsole.c
  30 @@ -515,6 +515,16 @@ ATIEnterGraphics
  31      ATIPtr      pATI
  32  )
  33  {
  34 +    CARD32 PciReg;
  35 +    pciVideoPtr pVideo = pATI->PCIInfo;
  36 +
  37 +/*
  38 +* Possibly fix block I/O indicator in PCI configuration space.
  39 +*/
  40 +    PCI_READ_LONG(pVideo, &PciReg, PCI_REG_USERCONFIG);
  41 +    if (!(PciReg & 0x00000004U))
  42 +       PCI_WRITE_LONG(pVideo, (PciReg | 0x00000004U), PCI_REG_USERCONFIG);
  43 +
  44      /* Map apertures */
  45      if (!ATIMapApertures(pScreenInfo->scrnIndex, pATI))
  46          return FALSE;