tech-x11 archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Re: prep (and bebox) xserver support
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.
> > Some problems exist though I think that I want to merge these. I do
> > not know the operational rule of xsrc at all. Who can advise me?
> >
> >
> > 1. Some PReP mounts S3 864 onboard with GENDAC.
> > In a word, s3_GENDAC.c is necessary. I take the source from old
> > xfree86. Do we mentenance this implementing only by us? Or, is it
> > asked for to Xorg for merging, and is it taken?
xsrc-prep-xserver.diff include s3_GENDAC.c.
> > 2. Present S3Probe seems not to operate correctly. Should I repair
> > S3PciChipsets? Or, should I implement PciProbe()?
> > And, should I manage the correction only for NetBSD?
>
> is the problem netbsd-specific?
I apologize the misunderstanding. It no problem. X-<
I will commit this patches, if you not have problems.
Next target, supports xserver for bebox. ;-)
Thanks,
--
kiyohara
? distrib/sets/lists/xserver/md.prep
Index: external/mit/xorg/lib/dri/Makefile
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/lib/dri/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- external/mit/xorg/lib/dri/Makefile 23 May 2010 21:31:52 -0000 1.14
+++ external/mit/xorg/lib/dri/Makefile 7 Jul 2010 05:31:35 -0000
@@ -11,6 +11,8 @@
.elif ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
SUBDIR+= i810 i915 i965 mach64 mga r128 r200 r300 r600 radeon \
savage sis tdfx unichrome
+.elif ${MACHINE} == "prep"
+SUBDIR+= mga
.endif
SUBDIR+= swrast
Index: external/mit/xorg/server/drivers/Makefile
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/server/drivers/Makefile,v
retrieving revision 1.44
diff -u -r1.44 Makefile
--- external/mit/xorg/server/drivers/Makefile 19 Jun 2010 18:17:55 -0000
1.44
+++ external/mit/xorg/server/drivers/Makefile 7 Jul 2010 05:31:35 -0000
@@ -170,6 +170,13 @@
.elif ${MACHINE} == "zaurus"
SUBDIR+= \
xf86-video-wsfb
+.elif ${MACHINE} == "prep"
+SUBDIR+= \
+ xf86-video-cirrus \
+ xf86-video-cirrus_alpine \
+ xf86-video-mga \
+ xf86-video-s3 \
+ xf86-video-vga
.endif
# broken with xorg-server 1.6
Index: external/mit/xorg/server/drivers/xf86-video-s3/Makefile
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/server/drivers/xf86-video-s3/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- external/mit/xorg/server/drivers/xf86-video-s3/Makefile 28 Aug 2009
17:20:07 -0000 1.8
+++ external/mit/xorg/server/drivers/xf86-video-s3/Makefile 7 Jul 2010
05:31:35 -0000
@@ -7,6 +7,7 @@
SRCS= s3_bios.c s3_cursor.c s3_dga.c s3_driver.c s3_IBMRGB.c \
s3_Ti.c s3_Trio64DAC.c s3_video.c s3_accel.c \
s3_accel_newmmio.c s3_shadow.c
+SRCS+= s3_GENDAC.c
MAN= s3.4
# PLEASE NOTE: s3_accel.c is compiled two times with different
Index: external/mit/xorg/server/xorg-server/Makefile.common
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/server/xorg-server/Makefile.common,v
retrieving revision 1.12
diff -u -r1.12 Makefile.common
--- external/mit/xorg/server/xorg-server/Makefile.common 19 Jun 2010
18:17:55 -0000 1.12
+++ external/mit/xorg/server/xorg-server/Makefile.common 7 Jul 2010
05:31:36 -0000
@@ -49,7 +49,7 @@
${MACHINE} == "sgimips" || ${MACHINE} == "shark" || \
${MACHINE} == "netwinder" || ${MACHINE} == "sparc64" || \
${MACHINE} == "sparc" || ${MACHINE} == "alpha" || \
- ${MACHINE} == "zaurus"
+ ${MACHINE} == "zaurus" || ${MACHINE} == "prep"
XSERVER_NEEDS_XFONT= yes
XSERVER_XFREE86= yes
.endif
Index: external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile
===================================================================
RCS file:
/cvsroot/src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile 11 Jun
2009 05:43:17 -0000 1.12
+++ external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile 7 Jul
2010 05:31:36 -0000
@@ -9,7 +9,8 @@
.if ${MACHINE} == "cats" || ${MACHINE} == "macppc" || \
${MACHINE} == "netwinder" || ${MACHINE_ARCH} == "sparc" || \
- ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "alpha"
+ ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "alpha" || \
+ ${MACHINE} == "prep"
#SUBDIR+=pcitweak scanpci
.endif
Index: external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile
===================================================================
RCS file:
/cvsroot/src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile 19 Jun
2010 18:17:56 -0000 1.21
+++ external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile 7 Jul
2010 05:31:36 -0000
@@ -32,7 +32,7 @@
.endfor
.endif
-.if ${MACHINE} == "macppc"
+.if ${MACHINE} == "macppc" || ${MACHINE} == "prep"
SRCS.bsd+= ppc_video.c stdResource.c pm_noop.c lnx_agp.c
.for _FN in ${SRCS.bsd}
CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC
@@ -90,7 +92,8 @@
.if ${MACHINE} == "macppc" || ${MACHINE} == "cats" || \
${MACHINE} == "sgimips" || ${MACHINE} == "shark" || \
${MACHINE} == "netwinder" || ${MACHINE_ARCH} == "sparc" || \
- ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "alpha"
+ ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "alpha" || \
+ ${MACHINE} == "prep"
#SRCS.bus+= netbsdPci.c
.endif
@@ -114,7 +117,7 @@
${MACHINE} == "sgimips" || ${MACHINE_ARCH} == "sparc64" || \
${MACHINE_ARCH} == "sparc" || ${MACHINE} == "netwinder" || \
${MACHINE} == "shark" || ${MACHINE} == "ofppc" || \
- ${MACHINE_ARCH} == "alpha"
+ ${MACHINE_ARCH} == "alpha" || ${MACHINE} == "prep"
#SRCS.misc+= CBUSmemcpy.c CIODelay.c CSlowBcopy.c
.endif
Index: share/mk/bsd.x11.mk
===================================================================
RCS file: /cvsroot/src/share/mk/bsd.x11.mk,v
retrieving revision 1.85
diff -u -r1.85 bsd.x11.mk
--- share/mk/bsd.x11.mk 17 Jun 2010 03:10:21 -0000 1.85
+++ share/mk/bsd.x11.mk 7 Jul 2010 05:32:01 -0000
@@ -113,6 +113,7 @@
${MACHINE} == "macppc" || \
${MACHINE} == "netwinder" || \
${MACHINE} == "ofppc" || \
+ ${MACHINE} == "prep" || \
${MACHINE} == "sgimips" || \
${MACHINE} == "sparc64" || \
${MACHINE} == "sparc" || \
Index: sys/arch/prep/conf/GENERIC
===================================================================
RCS file: /cvsroot/src/sys/arch/prep/conf/GENERIC,v
retrieving revision 1.154
diff -u -r1.154 GENERIC
--- sys/arch/prep/conf/GENERIC 5 Jul 2010 07:55:55 -0000 1.154
+++ sys/arch/prep/conf/GENERIC 7 Jul 2010 05:32:10 -0000
@@ -34,6 +34,8 @@
# Standard system options
+options INSECURE # disable kernel security levels - X needs this
+
options RTC_OFFSET=0 # hardware clock is this many mins. west of GMT
options NTP # NTP phase/frequency locked loop
@@ -165,6 +167,9 @@
# different kernel output - see dev/wscons/wsdisplayvar.h
options WS_KERNEL_FG=WSCOL_GREEN
#options WS_KERNEL_BG=WSCOL_BLACK
+# compatibility to other console drivers
+options WSDISPLAY_COMPAT_USL # VT handling
+options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes
# see dev/pckbport/wskbdmap_mfii.c for implemented layouts
#options PCKBD_LAYOUT="(KB_DE | KB_NODEAD)"
# allocate a number of virtual screens at autoconfiguration time
Index: sys/arch/prep/include/param.h
===================================================================
RCS file: /cvsroot/src/sys/arch/prep/include/param.h,v
retrieving revision 1.4
diff -u -r1.4 param.h
--- sys/arch/prep/include/param.h 17 Jun 2001 16:01:29 -0000 1.4
+++ sys/arch/prep/include/param.h 7 Jul 2010 05:32:10 -0000
@@ -47,3 +47,6 @@
#define KERNBASE 0x100000
#include <powerpc/param.h>
+
+/* at this offset we mmap() the PCI IO range in display drivers */
+#define PCI_MAGIC_IO_RANGE 0xf2000000
--- distrib/sets/lists/xserver/md.prep.orig 1970-01-01 09:00:00.000000000
+0900
+++ distrib/sets/lists/xserver/md.prep 2010-07-07 14:55:50.000000000 +0900
@@ -0,0 +1,136 @@
+# $NetBSD$
+./usr/X11R7/bin/X -unknown- xorg
+./usr/X11R7/bin/Xorg -unknown- xorg
+./usr/X11R7/bin/cvt -unknown- xorg
+./usr/X11R7/bin/gtf -unknown- xorg
+./usr/X11R7/lib/X11/doc/README.DRI -unknown- xorg
+./usr/X11R7/lib/X11/doc/README.rapidaccess -unknown- xorg
+./usr/X11R7/lib/modules/dri/mga_dri.so -unknown- xorg
+./usr/X11R7/lib/modules/dri/mga_dri.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/cirrus_alpine.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/cirrus_alpine.so.1 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/cirrus_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/cirrus_drv.so.1 -unknown-
xorg
+./usr/X11R7/lib/modules/drivers/kbd_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/kbd_drv.so.1 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/mga_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/mga_drv.so.1 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/mouse_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/mouse_drv.so.1 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/s3_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/s3_drv.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/ws_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/ws_drv.so.1 -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libdbe.a -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libdbe.so -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libdbe.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libdbe_g.a -unknown-
debuglib,xorg
+./usr/X11R7/lib/modules/extensions/libdbe_pic.a -unknown-
xorg
+./usr/X11R7/lib/modules/extensions/libdri.a -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libdri.so -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libdri.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libdri_g.a -unknown-
debuglib,xorg
+./usr/X11R7/lib/modules/extensions/libdri_pic.a -unknown-
xorg
+./usr/X11R7/lib/modules/extensions/libdri2.a -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libdri2.so -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libdri2.so.0 -unknown-
xorg
+./usr/X11R7/lib/modules/extensions/libdri2_g.a -unknown-
debuglib,xorg
+./usr/X11R7/lib/modules/extensions/libdri2_pic.a -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libextmod.a -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libextmod.so -unknown-
xorg
+./usr/X11R7/lib/modules/extensions/libextmod.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libextmod_g.a -unknown-
debuglib,xorg
+./usr/X11R7/lib/modules/extensions/libextmod_pic.a -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libglx.a -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libglx.so -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libglx.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libglx_g.a -unknown-
debuglib,xorg
+./usr/X11R7/lib/modules/extensions/libglx_pic.a -unknown-
xorg
+./usr/X11R7/lib/modules/extensions/librecord.a -unknown- xorg
+./usr/X11R7/lib/modules/extensions/librecord.so -unknown-
xorg
+./usr/X11R7/lib/modules/extensions/librecord.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/extensions/librecord_g.a -unknown-
debuglib,xorg
+./usr/X11R7/lib/modules/extensions/librecord_pic.a -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libshadow.a -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libshadow.so -unknown-
xorg
+./usr/X11R7/lib/modules/extensions/libshadow.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libshadow_g.a -unknown-
debuglib,xorg
+./usr/X11R7/lib/modules/extensions/libshadow_pic.a -unknown- xorg
+./usr/X11R7/lib/modules/libexa.a -unknown- xorg
+./usr/X11R7/lib/modules/libexa.so -unknown- xorg
+./usr/X11R7/lib/modules/libexa.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/libexa_g.a -unknown-
debuglib,xorg
+./usr/X11R7/lib/modules/libexa_pic.a -unknown- xorg
+./usr/X11R7/lib/modules/libfb.a -unknown-
xorg
+./usr/X11R7/lib/modules/libfb.so -unknown- xorg
+./usr/X11R7/lib/modules/libfb.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/libfb_g.a -unknown-
debuglib,xorg
+./usr/X11R7/lib/modules/libfb_pic.a -unknown- xorg
+./usr/X11R7/lib/modules/libi2c.a -unknown- xorg
+./usr/X11R7/lib/modules/libi2c.so -unknown- xorg
+./usr/X11R7/lib/modules/libi2c.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/libi2c_g.a -unknown-
debuglib,xorg
+./usr/X11R7/lib/modules/libi2c_pic.a -unknown- xorg
+./usr/X11R7/lib/modules/libint10.a -unknown- xorg
+./usr/X11R7/lib/modules/libint10.so -unknown- xorg
+./usr/X11R7/lib/modules/libint10.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/libint10_g.a -unknown-
debuglib,xorg
+./usr/X11R7/lib/modules/libint10_pic.a -unknown- xorg
+./usr/X11R7/lib/modules/libshadowfb.a -unknown- xorg
+./usr/X11R7/lib/modules/libshadowfb.so -unknown- xorg
+./usr/X11R7/lib/modules/libshadowfb.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/libshadowfb_g.a -unknown-
debuglib,xorg
+./usr/X11R7/lib/modules/libshadowfb_pic.a -unknown- xorg
+./usr/X11R7/lib/modules/libvbe.a -unknown- xorg
+./usr/X11R7/lib/modules/libvbe.so -unknown- xorg
+./usr/X11R7/lib/modules/libvbe.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/libvbe_g.a -unknown-
debuglib,xorg
+./usr/X11R7/lib/modules/libvbe_pic.a -unknown- xorg
+./usr/X11R7/lib/modules/libvgahw.a -unknown- xorg
+./usr/X11R7/lib/modules/libvgahw.so -unknown- xorg
+./usr/X11R7/lib/modules/libvgahw.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/libvgahw_g.a -unknown-
debuglib,xorg
+./usr/X11R7/lib/modules/libvgahw_pic.a -unknown- xorg
+./usr/X11R7/lib/modules/libxaa.a -unknown- xorg
+./usr/X11R7/lib/modules/libxaa.so -unknown- xorg
+./usr/X11R7/lib/modules/libxaa.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/libxaa_g.a -unknown-
debuglib,xorg
+./usr/X11R7/lib/modules/libxaa_pic.a -unknown- xorg
+./usr/X11R7/lib/modules/libxf8_16bpp.a -unknown- xorg
+./usr/X11R7/lib/modules/libxf8_16bpp.so -unknown-
xorg
+./usr/X11R7/lib/modules/libxf8_16bpp.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/libxf8_16bpp_g.a -unknown-
debuglib,xorg
+./usr/X11R7/lib/modules/libxf8_16bpp_pic.a -unknown- xorg
+./usr/X11R7/man/cat1/Xorg.0 -unknown-
.cat,xorg
+./usr/X11R7/man/cat1/cvt.0 -unknown-
.cat,xorg
+./usr/X11R7/man/cat1/gtf.0 -unknown-
.cat,xorg
+./usr/X11R7/man/cat4/cirrus.0 -unknown-
.cat,xorg
+./usr/X11R7/man/cat4/exa.0 -unknown-
.cat,xorg
+./usr/X11R7/man/cat4/kbd.0 -unknown-
.cat,xorg
+./usr/X11R7/man/cat4/mga.0 -unknown-
.cat,xorg
+./usr/X11R7/man/cat4/mousedrv.0 -unknown-
.cat,xorg
+./usr/X11R7/man/cat4/s3.0 -unknown-
.cat,xorg
+./usr/X11R7/man/cat4/ws.0 -unknown-
.cat,xorg
+./usr/X11R7/man/cat5/xorg.conf.0 -unknown-
.cat,xorg
+./usr/X11R7/man/html1/Xorg.html -unknown-
html,xorg
+./usr/X11R7/man/html1/cvt.html -unknown-
html,xorg
+./usr/X11R7/man/html1/gtf.html -unknown-
html,xorg
+./usr/X11R7/man/html4/cirrus.html -unknown-
html,xorg
+./usr/X11R7/man/html4/exa.html -unknown-
html,xorg
+./usr/X11R7/man/html4/kbd.html -unknown-
html,xorg
+./usr/X11R7/man/html4/mousedrv.html -unknown-
html,xorg
+./usr/X11R7/man/html4/mga.html -unknown-
html,xorg
+./usr/X11R7/man/html4/s3.html -unknown-
html,xorg
+./usr/X11R7/man/html4/ws.html -unknown-
html,xorg
+./usr/X11R7/man/html5/xorg.conf.html -unknown-
html,xorg
+./usr/X11R7/man/man1/Xorg.1 -unknown-
.man,xorg
+./usr/X11R7/man/man1/cvt.1 -unknown-
.man,xorg
+./usr/X11R7/man/man1/gtf.1 -unknown-
.man,xorg
+./usr/X11R7/man/man4/cirrus.4 -unknown-
.man,xorg
+./usr/X11R7/man/man4/exa.4 -unknown-
.man,xorg
+./usr/X11R7/man/man4/kbd.4 -unknown-
.man,xorg
+./usr/X11R7/man/man4/mga.4 -unknown-
.man,xorg
+./usr/X11R7/man/man4/mousedrv.4 -unknown-
.man,xorg
+./usr/X11R7/man/man4/s3.4 -unknown-
.man,xorg
+./usr/X11R7/man/man4/ws.4 -unknown-
.man,xorg
+./usr/X11R7/man/man5/xorg.conf.5 -unknown-
.man,xorg
? external/mit/xf86-video-s3/dist/src/s3_GENDAC.c
Index: external/mit/xf86-video-s3/dist/src/s3.h
===================================================================
RCS file: /cvsroot/xsrc/external/mit/xf86-video-s3/dist/src/s3.h,v
retrieving revision 1.4
diff -u -r1.4 s3.h
--- external/mit/xf86-video-s3/dist/src/s3.h 9 Jul 2009 03:47:09 -0000
1.4
+++ external/mit/xf86-video-s3/dist/src/s3.h 5 Jul 2010 07:24:10 -0000
@@ -228,6 +228,14 @@
void S3OutTiIndReg(ScrnInfoPtr pScrn, CARD32 reg, unsigned char mask,
unsigned char data);
+/* SDAC/GENDAC */
+Bool S3SDACProbe(ScrnInfoPtr pScrn);
+void S3GENDAC_PreInit(ScrnInfoPtr pScrn);
+void S3GENDAC_Init(ScrnInfoPtr pScrn, DisplayModePtr mode);
+void S3SDAC_Init(ScrnInfoPtr pScrn, DisplayModePtr mode);
+void S3GENDAC_Save(ScrnInfoPtr pScrn);
+void S3GENDAC_Restore(ScrnInfoPtr pScrn);
+
/* s3 gen cursor */
Bool S3_CursorInit(ScreenPtr pScreen);
@@ -243,6 +251,8 @@
#define TRIO64_RAMDAC 0x8811
#define TI3025_RAMDAC 0x3025
#define TI3020_RAMDAC 0x3020
+#define GENDAC_RAMDAC 0x0708
+#define SDAC_RAMDAC 0x0716
#define BIOS_BSIZE 1024
#define BIOS_BASE 0xc0000
@@ -251,6 +261,8 @@
* Chip...Sets...
*/
+#define S3_864_SERIES() ((pS3->Chipset == PCI_CHIP_864_0) ||
\
+ (pS3->Chipset == PCI_CHIP_864_1))
#define S3_964_SERIES() ((pS3->Chipset == PCI_CHIP_964_0) ||
\
(pS3->Chipset == PCI_CHIP_964_1))
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
@@ -130,6 +130,8 @@
/* supported chipsets */
static SymTabRec S3Chipsets[] = {
+ { PCI_CHIP_864_0, "864-0"},
+ { PCI_CHIP_864_1, "864-1"},
{ PCI_CHIP_964_0, "964-0"},
{ PCI_CHIP_964_1, "964-1"},
{ PCI_CHIP_968, "968" },
@@ -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 }
};
@@ -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
+ break;
+ case 16:
+ pS3->MaxClock = 55000;
+ break;
+ case 24:
+ case 32:
+ pS3->MaxClock = 27500;
+ break;
+ }
+ } else { /* SDAC */
+ pS3->DacInit = S3SDAC_Init;
+ switch(pScrn->bitsPerPixel) {
+ case 8:
+ pS3->MaxClock = 135000;
+ break;
+ case 16:
+#if 0
+ pS3->MaxClock = 110000;
+#else
+ pS3->MaxClock = 95000;
+#endif
+ break;
+ case 24:
+ case 32:
+#if 0
+ pS3->MaxClock = 55000;
+#else
+ pS3->MaxClock = 50000;
+#endif
+ break;
+ }
+ }
+ pScrn->rgbBits = 6;
+ pS3->LoadPalette = S3GenericLoadPalette;
+ }
if (S3TiDACProbe(pScrn)) {
pS3->DacPreInit = S3TiDAC_PreInit;
pS3->DacInit = S3TiDAC_Init;
@@ -1351,8 +1405,8 @@
outb(vgaCRIndex, 0x33);
new->cr33 = inb(vgaCRReg) | 0x20;
- if ((pS3->Chipset == PCI_CHIP_964_0) ||
- (pS3->Chipset == PCI_CHIP_964_1))
+ if (S3_864_SERIES () ||
+ S3_964_SERIES())
new->cr33 = 0x20;
else if (pS3->Chipset == PCI_CHIP_TRIO64V2_DXGX)
new->cr33 &= ~0x20;
@@ -1381,7 +1435,10 @@
switch (pScrn->bitsPerPixel) {
case 24:
case 32:
- new->cr43 = inb(vgaCRReg);
+ if (S3_864_SERIES())
+ new->cr43 = 0x08;
+ else
+ new->cr43 = inb(vgaCRReg);
break;
case 15:
case 16:
@@ -1391,6 +1448,10 @@
new->cr43 = 0x10;
else if (pS3->RamDac->RamDacType == TRIO64_RAMDAC)
new->cr43 = 0x09;
+ else if (pS3->RamDac->RamDacType == GENDAC_RAMDAC)
+ new->cr43 = 0x80;
+ else if (S3_864_SERIES())
+ new->cr43 = 0x08;
break;
case 8:
default:
--- external/mit/xf86-video-s3/dist/src/s3_GENDAC.c.orig 1970-01-01
09:00:00.000000000 +0900
+++ external/mit/xf86-video-s3/dist/src/s3_GENDAC.c 2010-07-05
16:29:13.000000000 +0900
@@ -0,0 +1,448 @@
+/*
+ * Copyright (c) 2009 KIYOHARA Takashi
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "xf86.h"
+#include "xf86_OSproc.h"
+
+#include "compiler.h"
+
+#include "s3.h"
+
+#define GENDAC_INDEX 0x3C8
+#define GENDAC_DATA 0x3C9
+
+
+static void S3GENDACSetClock(ScrnInfoPtr, long, int, int, int, int, int, int,
+ int, long, long);
+static void S3GENDACCalcClock(long, int, int, int, int, int, long, long,
+ unsigned char *, unsigned char *);
+static void S3GENDACSetPLL(ScrnInfoPtr, int, unsigned char, unsigned char);
+
+
+static void xf86dactopel(void);
+
+static void
+xf86dactopel()
+{
+ outb(0x3C8,0);
+ return;
+}
+
+
+Bool S3GENDACProbe(ScrnInfoPtr pScrn)
+{
+ /* probe for S3 GENDAC/SDAC */
+ /*
+ * S3 GENDAC and SDAC have two fixed read only PLL clocks
+ * CLK0 f0: 25.255MHz M-byte 0x28 N-byte 0x61
+ * CLK0 f1: 28.311MHz M-byte 0x3d N-byte 0x62
+ * which can be used to detect GENDAC and SDAC since there is no chip-id
+ * for the GENDAC.
+ *
+ * NOTE: for the GENDAC on a MIRO 10SD (805+GENDAC) reading PLL values
+ * for CLK0 f0 and f1 always returns 0x7f
+ * (but is documented "read only")
+ */
+
+ S3Ptr pS3 = S3PTR(pScrn);
+ int vgaCRIndex = pS3->vgaCRIndex, vgaCRReg = pS3->vgaCRReg;
+ unsigned char saveCR55, saveCR45, saveCR43, savelut[6];
+ unsigned int i; /* don't use signed int, UW2.0 compiler bug */
+ long clock01, clock23;
+ int found = 0;
+
+ if (!S3_864_SERIES()) /* need? */
+ return FALSE;
+
+ outb(vgaCRIndex, 0x43);
+ saveCR43 = inb(vgaCRReg);
+ outb(vgaCRReg, saveCR43 & ~0x02);
+
+ outb(vgaCRIndex, 0x45);
+ saveCR45 = inb(vgaCRReg);
+ outb(vgaCRReg, saveCR45 & ~0x20);
+
+ outb(vgaCRIndex, 0x55);
+ saveCR55 = inb(vgaCRReg);
+ outb(vgaCRReg, saveCR55 & ~1);
+
+ outb(0x3c7,0);
+ for(i = 0; i < 2 * 3; i++) /* save first two LUT entries */
+ savelut[i] = inb(0x3c9);
+ outb(0x3c8,0);
+ for(i = 0; i < 2 * 3; i++) /* set first two LUT entries to zero */
+ outb(0x3c9, 0);
+
+ outb(vgaCRIndex, 0x55);
+ outb(vgaCRReg, saveCR55 | 1);
+
+ outb(0x3c7,0);
+ for(i = clock01 = 0; i < 4; i++)
+ clock01 = (clock01 << 8) | (inb(0x3c9) & 0xff);
+ for(i = clock23 = 0; i < 4; i++)
+ clock23 = (clock23 << 8) | (inb(0x3c9) & 0xff);
+
+ outb(vgaCRIndex, 0x55);
+ outb(vgaCRReg, saveCR55 & ~1);
+
+ outb(0x3c8,0);
+ for(i = 0; i < 2 * 3; i++) /* restore first two LUT entries */
+ outb(0x3c9, savelut[i]);
+
+ outb(vgaCRIndex, 0x55);
+ outb(vgaCRReg, saveCR55);
+
+ if (clock01 == 0x28613d62 ||
+ (clock01 == 0x7f7f7f7f && clock23 != 0x7f7f7f7f)) {
+ xf86dactopel();
+ inb(0x3c6);
+ inb(0x3c6);
+ inb(0x3c6);
+
+ /* the fourth read will show the SDAC chip ID and revision */
+ if (((i = inb(0x3c6)) & 0xf0) == 0x70)
+ found = SDAC_RAMDAC;
+ else
+ found = GENDAC_RAMDAC;
+ saveCR43 &= ~0x02;
+ saveCR45 &= ~0x20;
+ xf86dactopel();
+ }
+
+ outb(vgaCRIndex, 0x45);
+ outb(vgaCRReg, saveCR45);
+
+ outb(vgaCRIndex, 0x43);
+ outb(vgaCRReg, saveCR43);
+
+ if (found) {
+ RamDacInit(pScrn, pS3->RamDacRec);
+ pS3->RamDac = RamDacHelperCreateInfoRec();
+ pS3->RamDac->RamDacType = found;
+ return TRUE;
+ }
+ return FALSE;
+}
+
+void S3GENDAC_PreInit(ScrnInfoPtr pScrn)
+{
+ S3Ptr pS3 = S3PTR(pScrn);
+ int vgaCRIndex = pS3->vgaCRIndex, vgaCRReg = pS3->vgaCRReg;
+ unsigned char saveCR55;
+ int m, n, n1, n2, mclk;
+
+ outb(vgaCRIndex, 0x55);
+ saveCR55 = inb(vgaCRReg);
+ outb(vgaCRReg, saveCR55 | 1);
+
+ outb(0x3C7, 10); /* read MCLK */
+ m = inb(0x3C9);
+ n = inb(0x3C9);
+
+ outb(vgaCRIndex, 0x55);
+ outb(vgaCRReg, saveCR55);
+
+ m &= 0x7f;
+ n1 = n & 0x1f;
+ n2 = (n >> 5) & 0x03;
+ mclk = ((1431818 * (m + 2)) / (n1 + 2) / (1 << n2) + 50) / 100;
+
+ pS3->mclk = mclk;
+ xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "MCLK %1.3f MHz\n",
+ mclk / 1000.0);
+}
+
+void S3GENDAC_Init(ScrnInfoPtr pScrn, DisplayModePtr mode)
+{
+ S3Ptr pS3 = S3PTR(pScrn);
+ int vgaCRIndex = pS3->vgaCRIndex, vgaCRReg = pS3->vgaCRReg;
+ int daccomm = 0; /* GENDAC command */
+ unsigned char blank, tmp;
+
+ S3GENDACSetClock(pScrn, mode->Clock * (pScrn->depth >> 3), 2, 1, 1, 31,
+ 0, 3, 1, 100000, 250000);
+
+ outb(0x3C4, 1);
+ blank = inb(0x3C5);
+ outb(0x3C5, blank | 0x20); /* blank the screen */
+
+ switch (pScrn->depth)
+ {
+ case 8: /* 8-bit color, 1VCLK/pixel */
+ break;
+
+ case 15: /* 15-bit color, 2VCLK/pixel */
+ daccomm = 0x20;
+ break;
+
+ case 16: /* 16-bit color, 2VCLK/pixel */
+ daccomm = 0x60;
+ break;
+
+ case 32: /* 32-bit color, 3VCLK/pixel */
+ daccomm = 0x40;
+ }
+
+ outb(vgaCRIndex, 0x55);
+ tmp = inb(vgaCRReg) | 1;
+ outb(vgaCRReg, tmp);
+
+ outb(0x3c6, daccomm); /* set GENDAC mux mode */
+
+ outb(vgaCRIndex, 0x55);
+ tmp = inb(vgaCRReg) & ~1;
+ outb(vgaCRReg, tmp);
+
+ outb(0x3C4, 1);
+ outb(0x3C5, blank); /* unblank the screen */
+}
+
+void S3SDAC_Init(ScrnInfoPtr pScrn, DisplayModePtr mode)
+{
+ S3Ptr pS3 = S3PTR(pScrn);
+ int vgaCRIndex = pS3->vgaCRIndex, vgaCRReg = pS3->vgaCRReg;
+ int pixmux = 0; /* SDAC command and CR67 */
+ int blank_delay = 0; /* CR6D */
+ int invert_vclk = 0; /* CR66 bit 0 */
+ unsigned char blank, tmp;
+
+#if 0
+ S3GENDACSetClock(pScrn,
+ (pScrn->depth == 32) ? mode->Clock * 2 : mode->Clock,
+ 2, 1, 1, 31, 0, 3, 1, 100000, 250000);
+#else
+ /* XXXX: for prep */
+ long freq;
+
+ switch (pScrn->depth) {
+ case 32:
+ freq = mode->Clock * 2; /* XXXX: frem xfree86 3.x */
+ break;
+ case 16:
+ freq = mode->Clock / 2;
+ break;
+ default:
+ freq = mode->Clock;
+ break;
+ }
+ S3GENDACSetClock(pScrn, freq,
+ 2, 1, 1, 31, 0, 3, 1, 100000, 250000);
+#endif
+
+ outb(vgaCRIndex, 0x42);/* select the clock */
+ tmp = inb(vgaCRReg) & 0xf0;
+ outb(vgaCRReg, tmp | 0x02);
+ usleep(150000);
+
+ outb(0x3C4, 1);
+ blank = inb(0x3C5);
+ outb(0x3C5, blank | 0x20); /* blank the screen */
+
+ switch (pScrn->depth)
+ {
+ case 8: /* 8-bit color, 1 VCLK/pixel */
+ pixmux = 0x10;
+ blank_delay = 2;
+ invert_vclk = 1;
+ break;
+
+ case 15: /* 15-bit color, 1VCLK/pixel */
+ pixmux = 0x30;
+ blank_delay = 2;
+ break;
+
+ case 16: /* 16-bit color, 1VCLK/pixel */
+ pixmux = 0x50;
+ blank_delay = 2;
+ break;
+
+ case 32: /* 32-bit color, 2VCLK/pixel */
+ pixmux = 0x70;
+ blank_delay = 2;
+ }
+
+ outb(vgaCRIndex, 0x55);
+ tmp = inb(vgaCRReg) | 1;
+ outb(vgaCRReg, tmp);
+
+ outb(vgaCRIndex, 0x67);
+ outb(vgaCRReg, pixmux | invert_vclk); /* set S3 mux mode */
+ outb(0x3c6, pixmux); /* set SDAC mux mode */
+
+ outb(vgaCRIndex, 0x6D);
+ outb(vgaCRReg, blank_delay); /* set blank delay */
+
+ outb(vgaCRIndex, 0x55);
+ tmp = inb(vgaCRReg) & ~1;
+ outb(vgaCRReg, tmp);
+
+ outb(0x3C4, 1);
+ outb(0x3C5, blank); /* unblank the screen */
+}
+
+void S3GENDAC_Save(ScrnInfoPtr pScrn)
+{
+ S3Ptr pS3 = S3PTR(pScrn);
+ int vgaCRIndex = pS3->vgaCRIndex, vgaCRReg = pS3->vgaCRReg;
+ S3RegPtr save = &pS3->SavedRegs;
+ unsigned char tmp;
+
+ outb(vgaCRIndex, 0x55);
+ tmp = inb(vgaCRReg);
+ outb(vgaCRReg, tmp | 1);
+
+ save->dacregs[0] = inb(0x3c6); /* Enhanced command register */
+ save->dacregs[2] = inb(0x3c8); /* PLL write index */
+ save->dacregs[1] = inb(0x3c7); /* PLL read index */
+ outb(0x3c7, 2); /* index to f2 reg */
+ save->dacregs[3] = inb(0x3c9); /* f2 PLL M divider */
+ save->dacregs[4] = inb(0x3c9); /* f2 PLL N1/N2 divider */
+ outb(0x3c7, 0x0e); /* index to PLL control */
+ save->dacregs[5] = inb(0x3c9); /* PLL control */
+
+ outb(vgaCRReg, tmp & ~1);
+}
+
+void S3GENDAC_Restore(ScrnInfoPtr pScrn)
+{
+ S3Ptr pS3 = S3PTR(pScrn);
+ int vgaCRIndex = pS3->vgaCRIndex, vgaCRReg = pS3->vgaCRReg;
+ S3RegPtr restore = &pS3->SavedRegs;
+ unsigned char tmp;
+
+ outb(vgaCRIndex, 0x55);
+ tmp = inb(vgaCRReg);
+ outb(vgaCRReg, tmp | 1);
+
+ outb(0x3c6, restore->dacregs[0]); /* Enhanced command register */
+ outb(0x3c8, 2); /* index to f2 reg */
+ outb(0x3c9, restore->dacregs[3]); /* f2 PLL M divider */
+ outb(0x3c9, restore->dacregs[4]); /* f2 PLL N1/N2 divider */
+ outb(0x3c8, 0x0e); /* index to PLL control */
+ outb(0x3c9, restore->dacregs[5]); /* PLL control */
+ outb(0x3c8, restore->dacregs[2]); /* PLL write index */
+ outb(0x3c7, restore->dacregs[1]); /* PLL read index */
+
+ outb(vgaCRReg, tmp & ~1);
+}
+
+static void
+S3GENDACSetClock(ScrnInfoPtr pScrn, long freq, int clk, int min_m, int min_n1,
+ int max_n1, int min_n2, int max_n2, int pll_type, long freq_min,
+ long freq_max)
+{
+ unsigned char m, n;
+
+ S3GENDACCalcClock(freq, min_m, min_n1, max_n1, min_n2, max_n2,
+ freq_min, freq_max, &m, &n);
+
+ /* XXX for pll_type == GENDAC */
+ S3GENDACSetPLL(pScrn, clk, m, n);
+}
+
+/* This function is copy from S3GENDACCalcClock() */
+static void
+S3GENDACCalcClock(long freq, int min_m, int min_n1, int max_n1, int min_n2,
+ int max_n2, long freq_min, long freq_max,
+ unsigned char *mdiv, unsigned char *ndiv)
+{
+ double ffreq, ffreq_min, ffreq_max;
+ double div, diff, best_diff;
+ unsigned int m;
+ unsigned char n1, n2, best_n1=18, best_n2=2, best_m=127;
+
+#define BASE_FREQ 14.31818
+ ffreq = freq / 1000.0 / BASE_FREQ;
+ ffreq_min = freq_min / 1000.0 / BASE_FREQ;
+ ffreq_max = freq_max / 1000.0 / BASE_FREQ;
+
+ if (ffreq < ffreq_min / (1 << max_n2)) {
+ ErrorF("invalid frequency %1.3f Mhz [freq >= %1.3f Mhz]\n",
+ ffreq*BASE_FREQ, ffreq_min*BASE_FREQ / (1 << max_n2));
+ ffreq = ffreq_min / (1 << max_n2);
+ }
+ if (ffreq > ffreq_max / (1 << min_n2)) {
+ ErrorF("invalid frequency %1.3f Mhz [freq <= %1.3f Mhz]\n",
+ ffreq*BASE_FREQ, ffreq_max*BASE_FREQ / (1 << min_n2));
+ ffreq = ffreq_max / (1<<min_n2);
+ }
+
+ /* work out suitable timings */
+
+ best_diff = ffreq;
+
+ for (n2 = min_n2; n2 <= max_n2; n2++) {
+ for (n1 = min_n1 + 2; n1 <= max_n1 + 2; n1++) {
+ m = (int)(ffreq * n1 * (1 << n2) + 0.5);
+ if (m < min_m + 2 || m > 127 + 2)
+ continue;
+ div = (double)(m) / (double)(n1);
+ if ((div >= ffreq_min) && (div <= ffreq_max)) {
+ diff = ffreq - div / (1 << n2);
+ if (diff < 0.0)
+ diff = -diff;
+ if (diff < best_diff) {
+ best_diff = diff;
+ best_m = m;
+ best_n1 = n1;
+ best_n2 = n2;
+ }
+ }
+ }
+ }
+
+ if (max_n1 == 63)
+ *ndiv = (best_n1 - 2) | (best_n2 << 6);
+ else
+ *ndiv = (best_n1 - 2) | (best_n2 << 5);
+ *mdiv = best_m - 2;
+}
+
+static void
+S3GENDACSetPLL(ScrnInfoPtr pScrn, int clk, unsigned char m, unsigned char n)
+{
+ S3Ptr pS3 = S3PTR(pScrn);
+ unsigned char tmp, tmp1;
+ int vgaCRIndex = pS3->vgaCRIndex, vgaCRReg = pS3->vgaCRReg;
+
+ /* set RS2 via CR55, yuck */
+ outb(vgaCRIndex, 0x55);
+ tmp = inb(vgaCRReg) & 0xFC;
+ outb(vgaCRReg, tmp | 0x01);
+ tmp1 = inb(GENDAC_INDEX);
+
+ outb(GENDAC_INDEX, clk);
+ outb(GENDAC_DATA, m);
+ outb(GENDAC_DATA, n);
+
+ /* Now clean up our mess */
+ outb(GENDAC_INDEX, tmp1);
+ outb(vgaCRReg, tmp);
+}
Home |
Main Index |
Thread Index |
Old Index