XFree86-i740.patch

   1 diff -u xc/programs/Xserver/hw/xfree86/drivers/i740/i740_driver.c:1.30 xc/programs/Xserver/hw/xfree86/drivers
   2 --- XFree86-4.1.0/xc/programs/Xserver/hw/xfree86/drivers/i740/i740_driver.c:1.30        Tue May 15 12:19:38 2
   3 +++ XFree86-4.1.0/xc/programs/Xserver/hw/xfree86/drivers/i740/i740_driver.c     Sun Jul  1 00:12:55 2001
   4 @@ -540,6 +540,13 @@
   5    }
   6    xf86PrintDepthBpp(pScrn);
   7
   8 +  /* Process the options */
   9 +  xf86CollectOptions(pScrn, NULL);
  10 +  if (!(pI740->Options = xalloc(sizeof(I740Options))))
  11 +    return FALSE;
  12 +  memcpy(pI740->Options, I740Options, sizeof(I740Options));
  13 +  xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, pI740->Options);
  14 +
  15    pScrn->rgbBits=8;
  16    if (xf86ReturnOptValBool(pI740->Options, OPTION_DAC_6BIT, FALSE))
  17      pScrn->rgbBits=6;
  18 @@ -563,13 +570,6 @@
  19
  20    hwp = VGAHWPTR(pScrn);
  21    pI740->cpp = pScrn->bitsPerPixel/8;
  22 -
  23 -  /* Process the options */
  24 -  xf86CollectOptions(pScrn, NULL);
  25 -  if (!(pI740->Options = xalloc(sizeof(I740Options))))
  26 -    return FALSE;
  27 -  memcpy(pI740->Options, I740Options, sizeof(I740Options));
  28 -  xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, pI740->Options);
  29
  30    /* 6-BIT dac isn't reasonable for modes with > 8bpp */
  31    if (xf86ReturnOptValBool(pI740->Options, OPTION_DAC_6BIT, FALSE) &&