XFree86-stolen_from_HEAD.patch

   1 * Alan Hourihane: fix typo in Bitmap.h (#4757)
   2 * Mark Vojkovich: The tdfx driver wasn't setting pScrn->fbOffset.  This
   3   seems to have been preventing the V4L module from working properly.
   4 * Marc Aurele La France: Fix bogus handling of BUS_CNTL Mach64 register
   5 * Mark Vojkovich: Have fb observe the pGC->fExpose flag.
   6 * Paulo Cesar Pereira de Andrade: The fbdev driver uses the same DGA
   7   initialization code as the vesa driver, this fix the bug the same way
   8   done in the vesa driver.
   9 * Matthieu Herrb: shared libXft minor revision number increment
  10 * Mark Vojkovich: Fix bug in ProcDbeGetVisualInfo reported by HP.
  11
  12 These diffs have been hacked on manually to make them apply to xf-4_1-branch.
  13
  14 Index: xc/programs/bitmap/Bitmap.h
  15 diff -u xc/programs/bitmap/Bitmap.h:1.3 xc/programs/bitmap/Bitmap.h:1.4
  16 --- XFree86-4.1.0/xc/programs/bitmap/Bitmap.h:1.3       Wed Jan 17 18:44:51 2001
  17 +++ XFree86-4.1.0/xc/programs/bitmap/Bitmap.h   Tue Jun 12 04:45:53 2001
  18 @@ -68,7 +68,7 @@
  19   dashed              Dashed             Boolean         True
  20   dashes              Dashes             Bitmap          XtUnspecifiedPixmap
  21   stippled            Stippled           Boolean         True
  22 - stipple             Sripple            Bitmap          XtUnspecifiedPixmap
  23 + stipple             Stipple            Bitmap          XtUnspecifiedPixmap
  24   proportional        Proportional       Boolean         True
  25   axes                Axes               Boolean         True
  26   button1Function     Button1Function    ButtonFunction  Set
  27 Index: xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_driver.c
  28 diff -u xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_driver.c:1.79 xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_driver.c:1.80
  29 --- XFree86-4.1.0/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_driver.c:1.79        Tue Jun  5 10:54:15 2001
  30 +++ XFree86-4.1.0/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_driver.c     Tue Jun 12 17:22:05 2001
  31 @@ -1897,6 +1897,8 @@
  32                                         pTDFX->stride - 1)/pTDFX->stride;
  33
  34    allocateMemory(pScrn);
  35 +
  36 +  pScrn->fbOffset = pTDFX->fbOffset;
  37
  38  #if 0
  39    if (pTDFX->numChips>1) {
  40 Index: xc/programs/Xserver/hw/xfree86/drivers/ati/atilock.c
  41 diff -u xc/programs/Xserver/hw/xfree86/drivers/ati/atilock.c:1.10 xc/programs/Xserver/hw/xfree86/drivers/ati/atilock.c:1.11
  42 --- XFree86-4.1.0/xc/programs/Xserver/hw/xfree86/drivers/ati/atilock.c:1.10     Sun Mar 25 00:32:07 2001
  43 +++ XFree86-4.1.0/xc/programs/Xserver/hw/xfree86/drivers/ati/atilock.c  Tue Jun 12 21:33:31 2001
  44 @@ -97,12 +97,17 @@
  45
  46      {
  47          /* Reset everything */
  48 -        pATI->LockData.bus_cntl =
  49 -            (inr(BUS_CNTL) & ~BUS_HOST_ERR_INT_EN) | BUS_HOST_ERR_INT;
  50 -        if (pATI->Chip < ATI_CHIP_264VTB)
  51 +        pATI->LockData.bus_cntl = inr(BUS_CNTL);
  52 +        if (pATI->Chip < ATI_CHIP_264VT4)
  53 +        {
  54              pATI->LockData.bus_cntl =
  55 -                (pATI->LockData.bus_cntl & ~BUS_FIFO_ERR_INT_EN) |
  56 -                    BUS_FIFO_ERR_INT;
  57 +                (pATI->LockData.bus_cntl & ~BUS_HOST_ERR_INT_EN) |
  58 +                BUS_HOST_ERR_INT;
  59 +            if (pATI->Chip < ATI_CHIP_264VTB)
  60 +                pATI->LockData.bus_cntl =
  61 +                    (pATI->LockData.bus_cntl & ~BUS_FIFO_ERR_INT_EN) |
  62 +                        BUS_FIFO_ERR_INT;
  63 +        }
  64          tmp = (pATI->LockData.bus_cntl & ~BUS_ROM_DIS) |
  65              SetBits(15, BUS_FIFO_WS);
  66          if (pATI->Chip >= ATI_CHIP_264VT)
  67 Index: xc/programs/Xserver/hw/xfree86/drivers/ati/atimach64.c
  68 diff -u xc/programs/Xserver/hw/xfree86/drivers/ati/atimach64.c:1.37 xc/programs/Xserver/hw/xfree86/drivers/ati/atimach64.c:1.38
  69 --- XFree86-4.1.0/xc/programs/Xserver/hw/xfree86/drivers/ati/atimach64.c:1.37   Thu May 24 21:44:35 2001
  70 +++ XFree86-4.1.0/xc/programs/Xserver/hw/xfree86/drivers/ati/atimach64.c        Tue Jun 12 21:33:31 2001
  71 @@ -110,8 +110,10 @@
  72          pATIHW->crtc_off_pitch = SetBits(pATI->displayWidth >> 3, CRTC_PITCH);
  73      }
  74
  75 -    bus_cntl = inr(BUS_CNTL);
  76 -    pATIHW->bus_cntl = (bus_cntl & ~BUS_HOST_ERR_INT_EN) | BUS_HOST_ERR_INT;
  77 +    pATIHW->bus_cntl = bus_cntl = inr(BUS_CNTL);
  78 +    if (pATI->Chip < ATI_CHIP_264VT4)
  79 +        pATIHW->bus_cntl = (pATIHW->bus_cntl & ~BUS_HOST_ERR_INT_EN) |
  80 +            BUS_HOST_ERR_INT;
  81      if (pATI->Chip < ATI_CHIP_264VTB)
  82      {
  83          pATIHW->bus_cntl &= ~(BUS_FIFO_ERR_INT_EN | BUS_ROM_DIS);
  84 Index: xc/programs/Xserver/hw/xfree86/drivers/ati/atiprobe.c
  85 diff -u xc/programs/Xserver/hw/xfree86/drivers/ati/atiprobe.c:1.45 xc/programs/Xserver/hw/xfree86/drivers/ati/atiprobe.c:1.46
  86 --- XFree86-4.1.0/xc/programs/Xserver/hw/xfree86/drivers/ati/atiprobe.c:1.45    Fri May 18 15:22:28 2001
  87 +++ XFree86-4.1.0/xc/programs/Xserver/hw/xfree86/drivers/ati/atiprobe.c Tue Jun 12 21:33:31 2001
  88 @@ -558,7 +558,7 @@
  89          outr(BUS_CNTL,
  90               (bus_cntl & ~(BUS_HOST_ERR_INT_EN | BUS_FIFO_ERR_INT_EN)) |
  91               (BUS_HOST_ERR_INT | BUS_FIFO_ERR_INT));
  92 -    else
  93 +    else if (Chip < ATI_CHIP_264VT4)
  94          outr(BUS_CNTL, (bus_cntl & ~BUS_HOST_ERR_INT_EN) | BUS_HOST_ERR_INT);
  95
  96      gen_test_cntl = inr(GEN_TEST_CNTL);
  97 @@ -969,9 +969,7 @@
  98  {
  99      ATIPtr pATI = *ppATI;
 100
 101 -    if (*ppVGA)
 102 -        ATIAssignVGA(pVideo, ppVGA, pATI, p8514, ProbeFlags);
 103 -    else
 104 +    if (!*ppVGA)
 105      {
 106          /*
 107           * An ATI PCI adapter has been detected at this point, and its VGA, if
 108 @@ -985,8 +983,10 @@
 109          if (pATI->VGAAdapter == ATI_ADAPTER_NONE)
 110              return;
 111
 112 -        ATIAssignVGA(pVideo, ppATI, pATI, p8514, ProbeFlags);
 113 +        ppVGA = ppATI;
 114      }
 115 +
 116 +    ATIAssignVGA(pVideo, ppVGA, pATI, p8514, ProbeFlags);
 117  }
 118
 119  #endif /* AVOID_CPIO */
 120 Index: xc/programs/Xserver/fb/fbcopy.c
 121 diff -u xc/programs/Xserver/fb/fbcopy.c:1.9 xc/programs/Xserver/fb/fbcopy.c:1.10
 122 --- XFree86-4.1.0/xc/programs/Xserver/fb/fbcopy.c:1.9   Sun Jun  3 13:45:17 2001
 123 +++ XFree86-4.1.0/xc/programs/Xserver/fb/fbcopy.c       Wed Jun 13 19:36:50 2001
 124 @@ -577,7 +577,7 @@
 125                       &rgnDst, dx, dy, copyProc, bitPlane, closure);
 126
 127      /* Pixmap sources generate a NoExposed (we return NULL to do this) */
 128 -    if (!fastExpose)
 129 +    if (!fastExpose && pGC->fExpose)
 130         prgnExposed = miHandleExposures(pSrcDrawable, pDstDrawable, pGC,
 131                                         origSource.x, origSource.y,
 132                                         (int)origSource.width,
 133 Index: xc/programs/Xserver/hw/xfree86/drivers/fbdev/fbdev.c
 134 diff -u xc/programs/Xserver/hw/xfree86/drivers/fbdev/fbdev.c:1.33 xc/programs/Xserver/hw/xfree86/drivers/fbdev/fbdev.c:1.34
 135 --- XFree86-4.1.0/xc/programs/Xserver/hw/xfree86/drivers/fbdev/fbdev.c:1.33     Fri Jun 15 16:22:49 2001
 136 +++ XFree86-4.1.0/xc/programs/Xserver/hw/xfree86/drivers/fbdev/fbdev.c  Fri Jun 15 17:29:58 2001
 137 @@ -870,8 +870,11 @@
 138         fbdevHWUnmapVidmem(pScrn);
 139         if (fPtr->shadowmem)
 140                 xfree(fPtr->shadowmem);
 141 -       if (fPtr->pDGAMode)
 142 +       if (fPtr->pDGAMode) {
 143           xfree(fPtr->pDGAMode);
 144 +         fPtr->pDGAMode = NULL;
 145 +         fPtr->nDGAMode = 0;
 146 +       }
 147         pScrn->vtSema = FALSE;
 148
 149         pScreen->CloseScreen = fPtr->CloseScreen;
 150 Index: xc/config/cf/X11.tmpl
 151 diff -u xc/config/cf/X11.tmpl:1.119 xc/config/cf/X11.tmpl:1.120
 152 --- XFree86-4.1.0/xc/config/cf/X11.tmpl:1.119   Thu May 31 21:10:00 2001
 153 +++ XFree86-4.1.0/xc/config/cf/X11.tmpl Mon Jun 18 16:28:49 2001
 154 @@ -2476,7 +2476,7 @@
 155            XFTLIBSRC = $(LIBSRC)/Xft
 156  #if SharedLibXft
 157  #ifndef SharedXftRev
 158 -#define SharedXftRev 1.0
 159 +#define SharedXftRev 1.1
 160  #endif
 161  SharedLibReferences(XFT,Xft,$(XFTLIBSRC),SOXFTREV,SharedXftRev)
 162  #else
 163 Index: xc/programs/Xserver/dbe/dbe.c
 164 diff -u xc/programs/Xserver/dbe/dbe.c:3.8 xc/programs/Xserver/dbe/dbe.c:3.9
 165 --- XFree86-4.1.0/xc/programs/Xserver/dbe/dbe.c:3.8     Wed Jan 17 17:36:41 2001
 166 +++ XFree86-4.1.0/xc/programs/Xserver/dbe/dbe.c Fri Jun 22 22:33:21 2001
 167 @@ -962,7 +962,7 @@
 168
 169      rep.type           = X_Reply;
 170      rep.sequenceNumber = client->sequence;
 171 -    rep.length         = length;
 172 +    rep.length         = length >> 2;
 173      rep.m              = count;
 174
 175      if (client->swapped)