tech-x11 archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Re: prep (and bebox) xserver support



Hi Takashi,

On Wed, Jul 07, 2010 at 03:19:09PM +0900, KIYOHARA Takashi wrote:
> Hi! Matthew and Michael
> 
> 
> From: matthew green <mrg%eterna.com.au@localhost>
> Date: Thu, 01 Jul 2010 15:54:28 +1000
> 
> > > I supported xserver for bebox and prep of last year.  It is very old
> > > though this exists as a patch now.
> > > 
> > >   ftp://ftp.netbsd.org/pub/NetBSD/misc/kiyohara/xserver/
> > > 
> > > And, I am trying the build of xserver again at present for bebox and
> > > prep at current.
> 
> xserver (s3 864) works on prep 5.99.32.
> Please see attached patches.

[..]

> Index: external/mit/xf86-video-s3/dist/src/s3_driver.c
> ===================================================================
> RCS file: /cvsroot/xsrc/external/mit/xf86-video-s3/dist/src/s3_driver.c,v
> retrieving revision 1.1.1.4
> diff -u -r1.1.1.4 s3_driver.c
> --- external/mit/xf86-video-s3/dist/src/s3_driver.c   22 Aug 2009 00:04:25 
> -0000      1.1.1.4
> +++ external/mit/xf86-video-s3/dist/src/s3_driver.c   5 Jul 2010 07:24:11 
> -0000
[..]

> @@ -142,13 +144,15 @@
>  
>  
>  static PciChipsets S3PciChipsets[] = {
> +     { PCI_CHIP_864_0,       PCI_CHIP_864_0,         RES_SHARED_VGA },
> +     { PCI_CHIP_864_1,       PCI_CHIP_864_1,         RES_SHARED_VGA },
>       { PCI_CHIP_964_0,       PCI_CHIP_964_0,         RES_SHARED_VGA },
>       { PCI_CHIP_964_1,       PCI_CHIP_964_1,         RES_SHARED_VGA },
> -     { PCI_CHIP_968,         PCI_CHIP_968,           RES_SHARED_VGA },
> -     { PCI_CHIP_TRIO,        PCI_CHIP_TRIO,          RES_SHARED_VGA },
> -     { PCI_CHIP_AURORA64VP,  PCI_CHIP_AURORA64VP,    RES_SHARED_VGA },
> -     { PCI_CHIP_TRIO64UVP,   PCI_CHIP_TRIO64UVP,     RES_SHARED_VGA },
> -     { PCI_CHIP_TRIO64V2_DXGX,       PCI_CHIP_TRIO64V2_DXGX,         
> RES_SHARED_VGA },
> +     { PCI_CHIP_968,         PCI_CHIP_968,           RES_SHARED_VGA },
> +     { PCI_CHIP_TRIO,        PCI_CHIP_TRIO,          RES_SHARED_VGA },
> +     { PCI_CHIP_AURORA64VP,  PCI_CHIP_AURORA64VP,    RES_SHARED_VGA },
> +     { PCI_CHIP_TRIO64UVP,   PCI_CHIP_TRIO64UVP,     RES_SHARED_VGA },
> +     { PCI_CHIP_TRIO64V2_DXGX, PCI_CHIP_TRIO64V2_DXGX, RES_SHARED_VGA },
>       { -1,                   -1,                     RES_UNDEFINED }
>  };

Can you only add the two new lines and not change the other lines in this part?

> @@ -486,6 +490,8 @@
>  #endif
>  
>       switch (pS3->Chipset) {
> +     case PCI_CHIP_864_0:
> +     case PCI_CHIP_864_1:
>       case PCI_CHIP_964_0:
>       case PCI_CHIP_964_1:
>       case PCI_CHIP_TRIO:
> @@ -609,6 +615,54 @@
>       pScrn->rgbBits = 8;     /* set default */
>  
>       /* probe for dac */
> +     if (S3GENDACProbe(pScrn)) {
> +             pS3->DacPreInit = S3GENDAC_PreInit;
> +             pS3->DacSave = S3GENDAC_Save;
> +             pS3->DacRestore = S3GENDAC_Restore;
> +             if (pS3->RamDac->RamDacType == GENDAC_RAMDAC) {
> +                     pS3->DacInit = S3GENDAC_Init;
> +                     switch(pScrn->bitsPerPixel) {
> +                     case 8:
> +#if 0
> +                             pS3->MaxClock = 110000;
> +#else
> +                             pS3->MaxClock = 95000;
> +#endif

What is the reason you are not using 110000 or 55000 further down?
I would remove the three #if 0 parts.
Maybe add a note that the MaxClock is reduced and what it should be.

Bernd



Home | Main Index | Thread Index | Old Index