Import most of XFree86 4.4RC3. This import excludes files which have the

    new license. If we want to, later we can import 4.4RC3 again and pick
    up the files that have the new license, but for now the vendor branch
    is "pure."
parent 10c83bf2
......@@ -10,7 +10,7 @@
<date>5 October 2003
<ident>
$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/SiS.sgml,v 3.8 2003/10/19 19:29:14 dawes Exp $
$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/SiS.sgml,v 3.9 2004/02/15 02:16:49 dawes Exp $
</ident>
<!-- Table of contents -->
......@@ -167,7 +167,7 @@ XF86Config file for this card.
amount of total video RAM available. However, the X driver needs to know about
the amount of RAM sisfb reserved. For this purpose, the Option "MaxXFBMem" exists.
XFree 4.3.0 disabled SiS DRI support due to a lack of maintainance of the SiS DRI
XFree 4.3.0 disabled SiS DRI support due to a lack of maintenance of the SiS DRI
driver. XFree86 4.4 contains a newly written SiS DRI driver by Eric Anholt.
If you intend to use DRI, I recommend setting the total video memory in the BIOS
......
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis_dac.c,v 1.56 2004/01/23 22:29:04 twini Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis_dac.c,v 1.57 2004/02/02 03:55:29 dawes Exp $ */
/*
* DAC helper functions (Save/Restore, MemClk, etc)
*
......@@ -1473,10 +1473,16 @@ int SiSMemBandWidth(ScrnInfoPtr pScrn, BOOLEAN IsForCRT2)
int bytesperpixel = (bpp + 7) / 8;
float magic=0.0, total, crt2used, maxcrt2;
int crt2clock, max=0;
#ifdef __SUNPRO_C
#define const
#endif
const float magic300[4] = { 1.2, 1.368421, 2.263158, 1.2};
const float magic630[4] = { 1.441177, 1.441177, 2.588235, 1.441177 };
const float magic315[4] = { 1.2, 1.368421, 1.368421, 1.2 };
const float magic550[4] = { 1.441177, 1.441177, 2.588235, 1.441177 };
#ifdef __SUNPRO_C
#undef const
#endif
BOOLEAN DHM, GetForCRT1;
switch(pSiS->Chipset) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment