Re: bebox xserver support

[KIYOHARA Takashi <kiyohara%kk.iij4u.or.jp@localhost>]

Hi! Matthew and Michael,


From: KIYOHARA Takashi <kiyohara%kk.iij4u.or.jp@localhost>
Date: Fri, 23 Jul 2010 13:23:07 +0900 (JST)

> However, I want to merge these first of all.
> I will commit diff connected with this mail to the next week.  ;-)

Merged.


By the way, are you ensuring that this function can be executed with
non-PC/AT machine?
# BeBox not has BIOS...  X-)


Index: external/mit/xf86-video-s3virge/dist/src/s3v_driver.c
===================================================================
RCS file: /cvsroot/xsrc/external/mit/xf86-video-s3virge/dist/src/s3v_driver.c,v
retrieving revision 1.1.1.4
diff -u -r1.1.1.4 s3v_driver.c
--- external/mit/xf86-video-s3virge/dist/src/s3v_driver.c       22 Aug 2009 00:0
4:29 -0000      1.1.1.4
+++ external/mit/xf86-video-s3virge/dist/src/s3v_driver.c       1 Aug 2010 05:51
:44 -0000
@@ -1058,6 +1058,7 @@
                ps3v->videoRamKbytes);
    }

+#if defined(__i386__) || defined(__x86_64__)
    /* reset S3 graphics engine to avoid memory corruption */
    if (ps3v->Chipset != S3_ViRGE_VX) {
       VGAOUT8(vgaCRIndex, 0x66);
@@ -1110,6 +1111,7 @@
       VGAOUT8(vgaCRReg, cr66 & ~0x02);  /* clear reset flag */
       usleep(10000);  /* wait a little bit... */
    }
+#endif /* defined(__i386__) || defined(__x86_64__) */

    /* Detect current MCLK and print it for user */
    VGAOUT8(0x3c4, 0x08);
@@ -1129,6 +1131,7 @@
        * Toshiba Tecra 5x0/7x0 seems to use 28.636 MHz
        * Compaq Armada 7x00 uses 14.318 MHz
        */
+#if defined(__i386__) || defined(__x86_64__)
       if (find_bios_string(ps3v, BIOS_BASE, "COMPAQ M5 BIOS", NULL) != NULL) {
         if (xf86GetVerbosity())
            xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "COMPAQ M5 BIOS found\n");
@@ -1139,6 +1142,7 @@
            xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "TOSHIBA Video BIOS found\n")
;
         /* ps3v->refclk_fact = 2.0; */
       }
+#endif
       /* else */ {  /* always use guessed value... */
         if (mclk > 60000)
            ps3v->refclk_fact = 1.0;


However, my S3virge hangs up with other problem(s).  X-<

Thanks,
--
kiyohara