XFree86-Servers-fix-01-r128.patch

   1
   2 7 February 2000
   3
   4 This patch fixes a text corruption problem that shows up with the
   5 Rage 128 driver in 3.3.6.  To use this patch you need either the
   6 XFree86 source tree or the LinkKit.  This patch cannot be used to
   7 patch binaries directly.  Updated binaries for most platforms should
   8 be available soon.
   9
  10 To apply the patch to the XFree86 source tree, go the directory containing
  11 the main "xc" directory, and run:
  12
  13   patch -p0 -E < this-file
  14
  15
  16
  17 Index: xc/programs/Xserver/hw/xfree86/vga256/drivers/r128/r128_accel.c
  18 ===================================================================
  19 RCS file: /home/x-cvs/xc/programs/Xserver/hw/xfree86/vga256/drivers/r128/Attic/r128_accel.c,v
  20 retrieving revision 1.1.2.3
  21 diff -u -r1.1.2.3 r128_accel.c
  22 --- r128_accel.c        1999/11/18 15:37:32     1.1.2.3
  23 +++ xc/programs/Xserver/hw/xfree86/vga256/drivers/r128/r128_accel.c     2000/01/28 03:23:14
  24 @@ -179,7 +179,7 @@
  25      R128InfoPtr   info      = R128PTR();
  26      unsigned char *R128MMIO = info->MMIO;
  27
  28 -    R128WaitForFifo(3);
  29 +    R128WaitForFifo(4);
  30      OUTREG(R128_DP_GUI_MASTER_CNTL, (info->dp_gui_master_cntl
  31                                      | R128_GMC_BRUSH_SOLID_COLOR
  32                                      | R128_GMC_SRC_DATATYPE_COLOR
  33 @@ -188,6 +188,8 @@
  34                                      | R128_AUX_CLIP_DIS));
  35      OUTREG(R128_DP_BRUSH_FRGD_CLR,  color);
  36      OUTREG(R128_DP_WRITE_MASK,      planemask);
  37 +    OUTREG(R128_DP_CNTL,            (R128_DST_X_LEFT_TO_RIGHT
  38 +                                    | R128_DST_Y_TOP_TO_BOTTOM));
  39  }
  40
  41  /* Subsequent XAA FillRectSolid. */
  42 @@ -364,6 +366,9 @@
  43      OUTREG(R128_DST_Y_X,            ((info->scanline_y++ << 16)
  44                                      | info->scanline_x));
  45      OUTREG(R128_DST_HEIGHT_WIDTH,   info->scanline_h_w);
  46 +
  47 +                               /* Correct for new XAA offset calculation */
  48 +    p += ((srcAddr/8-1)/4);
  49
  50  #if R128_FAST_COLOR_EXPAND
  51      while (left) {
  52 Index: xc/programs/Xserver/hw/xfree86/vga256/vga/vga.h
  53 ===================================================================
  54 RCS file: /home/x-cvs/xc/programs/Xserver/hw/xfree86/vga256/vga/Attic/vga.h,v
  55 retrieving revision 3.23.2.7
  56 diff -u -r3.23.2.7 vga.h
  57 --- vga.h       1998/07/30 06:24:18     3.23.2.7
  58 +++ xc/programs/Xserver/hw/xfree86/vga256/vga/vga.h     2000/02/05 19:31:53
  59 @@ -30,7 +30,7 @@
  60
  61  #define VGA2_PATCHLEVEL "0"
  62  #define VGA16_PATCHLEVEL "0"
  63 -#define SVGA_PATCHLEVEL "0"
  64 +#define SVGA_PATCHLEVEL "1"
  65
  66  #include "X.h"
  67  #include "misc.h"
  68