Checked in the following released items:

xkeyboard-config-1.4.tar.gz
ttf-bitstream-vera-1.10.tar.gz
font-alias-1.0.1.tar.gz
font-sun-misc-1.0.0.tar.gz
font-sun-misc-1.0.0.tar.gz
font-sony-misc-1.0.0.tar.gz
font-schumacher-misc-1.0.0.tar.gz
font-mutt-misc-1.0.0.tar.gz
font-misc-misc-1.0.0.tar.gz
font-misc-meltho-1.0.0.tar.gz
font-micro-misc-1.0.0.tar.gz
font-jis-misc-1.0.0.tar.gz
font-isas-misc-1.0.0.tar.gz
font-dec-misc-1.0.0.tar.gz
font-daewoo-misc-1.0.0.tar.gz
font-cursor-misc-1.0.0.tar.gz
font-arabic-misc-1.0.0.tar.gz
font-winitzki-cyrillic-1.0.0.tar.gz
font-misc-cyrillic-1.0.0.tar.gz
font-cronyx-cyrillic-1.0.0.tar.gz
font-screen-cyrillic-1.0.1.tar.gz
font-xfree86-type1-1.0.1.tar.gz
font-adobe-utopia-type1-1.0.1.tar.gz
font-ibm-type1-1.0.0.tar.gz
font-bitstream-type1-1.0.0.tar.gz
font-bitstream-speedo-1.0.0.tar.gz
font-bh-ttf-1.0.0.tar.gz
font-bh-type1-1.0.0.tar.gz
font-bitstream-100dpi-1.0.0.tar.gz
font-bh-lucidatypewriter-100dpi-1.0.0.tar.gz
font-bh-100dpi-1.0.0.tar.gz
font-adobe-utopia-100dpi-1.0.1.tar.gz
font-adobe-100dpi-1.0.0.tar.gz
font-util-1.0.1.tar.gz
font-bitstream-75dpi-1.0.0.tar.gz
font-bh-lucidatypewriter-75dpi-1.0.0.tar.gz
font-adobe-utopia-75dpi-1.0.1.tar.gz
font-bh-75dpi-1.0.0.tar.gz
bdftopcf-1.0.1.tar.gz
font-adobe-75dpi-1.0.0.tar.gz
mkfontscale-1.0.6.tar.gz
openssl-0.9.8k.tar.gz
bigreqsproto-1.0.2.tar.gz
xtrans-1.2.2.tar.gz
resourceproto-1.0.2.tar.gz
inputproto-1.4.4.tar.gz
compositeproto-0.4.tar.gz
damageproto-1.1.0.tar.gz
zlib-1.2.3.tar.gz
xkbcomp-1.0.5.tar.gz
freetype-2.3.9.tar.gz
pthreads-w32-2-8-0-release.tar.gz
pixman-0.12.0.tar.gz
kbproto-1.0.3.tar.gz
evieext-1.0.2.tar.gz
fixesproto-4.0.tar.gz
recordproto-1.13.2.tar.gz
randrproto-1.2.2.tar.gz
scrnsaverproto-1.1.0.tar.gz
renderproto-0.9.3.tar.gz
xcmiscproto-1.1.2.tar.gz
fontsproto-2.0.2.tar.gz
xextproto-7.0.3.tar.gz
xproto-7.0.14.tar.gz
libXdmcp-1.0.2.tar.gz
libxkbfile-1.0.5.tar.gz
libfontenc-1.0.4.tar.gz
libXfont-1.3.4.tar.gz
libX11-1.1.5.tar.gz
libXau-1.0.4.tar.gz
libxcb-1.1.tar.gz
xorg-server-1.5.3.tar.gz

6 files changed, 1762 insertions, 0 deletions

diff --git a/xorg-server/hw/kdrive/chips/Makefile.am b/xorg-server/hw/kdrive/chips/Makefile.am
new file mode 100644
index 000000000..46e176051
--- /dev/null
+++ b/xorg-server/hw/kdrive/chips/Makefile.am
@@ -0,0 +1,36 @@
+INCLUDES = 					\
+	@KDRIVE_INCS@				\
+	-I$(top_srcdir)/hw/kdrive/vesa		\
+	@KDRIVE_CFLAGS@
+
+bin_PROGRAMS = Xchips
+
+noinst_LIBRARIES = libchips.a
+
+libchips_a_SOURCES = 	\
+	chipsdraw.c	\
+	chips.c		\
+	chips.h	
+
+Xchips_SOURCES = \
+	chipsstub.c
+
+CHIPS_LIBS =					 \
+	libchips.a 				 \
+	$(top_builddir)/hw/kdrive/vesa/libvesa.a \
+	@KDRIVE_LIBS@
+
+if GLX
+Xchips_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
+endif
+
+Xchips_LDADD = \
+	$(CHIPS_LIBS)				\
+	@KDRIVE_LIBS@
+
+Xchips_DEPENDENCIES = 	\
+	libchips.a 				 \
+	@KDRIVE_LOCAL_LIBS@
+
+relink:
+	rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS)
diff --git a/xorg-server/hw/kdrive/chips/Makefile.in b/xorg-server/hw/kdrive/chips/Makefile.in
new file mode 100644
index 000000000..5e149cb4a
--- /dev/null
+++ b/xorg-server/hw/kdrive/chips/Makefile.in
@@ -0,0 +1,717 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+bin_PROGRAMS = Xchips$(EXEEXT)
+subdir = hw/kdrive/chips
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/include/do-not-use-config.h \
+	$(top_builddir)/include/xorg-server.h \
+	$(top_builddir)/include/dix-config.h \
+	$(top_builddir)/include/xgl-config.h \
+	$(top_builddir)/include/xorg-config.h \
+	$(top_builddir)/include/xkb-config.h \
+	$(top_builddir)/include/xwin-config.h \
+	$(top_builddir)/include/kdrive-config.h
+CONFIG_CLEAN_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
+ARFLAGS = cru
+libchips_a_AR = $(AR) $(ARFLAGS)
+libchips_a_LIBADD =
+am_libchips_a_OBJECTS = chipsdraw.$(OBJEXT) chips.$(OBJEXT)
+libchips_a_OBJECTS = $(am_libchips_a_OBJECTS)
+am__installdirs = "$(DESTDIR)$(bindir)"
+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(bin_PROGRAMS)
+am_Xchips_OBJECTS = chipsstub.$(OBJEXT)
+Xchips_OBJECTS = $(am_Xchips_OBJECTS)
+am__DEPENDENCIES_1 = libchips.a \
+	$(top_builddir)/hw/kdrive/vesa/libvesa.a
+Xchips_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(Xchips_LDFLAGS) \
+	$(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(libchips_a_SOURCES) $(Xchips_SOURCES)
+DIST_SOURCES = $(libchips_a_SOURCES) $(Xchips_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
+ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
+ALLOCA = @ALLOCA@
+AMTAR = @AMTAR@
+APPDEFAULTDIR = @APPDEFAULTDIR@
+APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
+APP_MAN_DIR = @APP_MAN_DIR@
+APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
+AR = @AR@
+AS = @AS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BASE_FONT_PATH = @BASE_FONT_PATH@
+BUILD_DATE = @BUILD_DATE@
+BUILD_TIME = @BUILD_TIME@
+CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DARWIN_LIBS = @DARWIN_LIBS@
+DBUS_CFLAGS = @DBUS_CFLAGS@
+DBUS_LIBS = @DBUS_LIBS@
+DEFAULT_LIBRARY_PATH = @DEFAULT_LIBRARY_PATH@
+DEFAULT_LOGPREFIX = @DEFAULT_LOGPREFIX@
+DEFAULT_MODULE_PATH = @DEFAULT_MODULE_PATH@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DGA_CFLAGS = @DGA_CFLAGS@
+DGA_LIBS = @DGA_LIBS@
+DIX_CFLAGS = @DIX_CFLAGS@
+DLLTOOL = @DLLTOOL@
+DMXEXAMPLES_DEP_CFLAGS = @DMXEXAMPLES_DEP_CFLAGS@
+DMXEXAMPLES_DEP_LIBS = @DMXEXAMPLES_DEP_LIBS@
+DMXMODULES_CFLAGS = @DMXMODULES_CFLAGS@
+DMXMODULES_LIBS = @DMXMODULES_LIBS@
+DMXXIEXAMPLES_DEP_CFLAGS = @DMXXIEXAMPLES_DEP_CFLAGS@
+DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
+DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
+DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
+DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
+DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
+DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
+DRIPROTO_LIBS = @DRIPROTO_LIBS@
+DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
+DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DRI_DRIVER_PATH = @DRI_DRIVER_PATH@
+DSYMUTIL = @DSYMUTIL@
+DTRACE = @DTRACE@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+FILE_MAN_DIR = @FILE_MAN_DIR@
+FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
+FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+FREETYPE_LIBS = @FREETYPE_LIBS@
+GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@
+GLX_DEFINES = @GLX_DEFINES@
+GL_CFLAGS = @GL_CFLAGS@
+GL_LIBS = @GL_LIBS@
+GREP = @GREP@
+HAL_CFLAGS = @HAL_CFLAGS@
+HAL_LIBS = @HAL_LIBS@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+KDRIVE_CFLAGS = @KDRIVE_CFLAGS@
+KDRIVE_INCS = @KDRIVE_INCS@
+KDRIVE_LIBS = @KDRIVE_LIBS@
+KDRIVE_LOCAL_LIBS = @KDRIVE_LOCAL_LIBS@
+KDRIVE_PURE_INCS = @KDRIVE_PURE_INCS@
+KDRIVE_PURE_LIBS = @KDRIVE_PURE_LIBS@
+LAUNCHD = @LAUNCHD@
+LDFLAGS = @LDFLAGS@
+LD_EXPORT_SYMBOLS_FLAG = @LD_EXPORT_SYMBOLS_FLAG@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBDRM_CFLAGS = @LIBDRM_CFLAGS@
+LIBDRM_LIBS = @LIBDRM_LIBS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIB_MAN_DIR = @LIB_MAN_DIR@
+LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
+LINUXDOC = @LINUXDOC@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MAKE_HTML = @MAKE_HTML@
+MAKE_PDF = @MAKE_PDF@
+MAKE_PS = @MAKE_PS@
+MAKE_TEXT = @MAKE_TEXT@
+MESA_SOURCE = @MESA_SOURCE@
+MISC_MAN_DIR = @MISC_MAN_DIR@
+MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+MKDIR_P = @MKDIR_P@
+MKFONTDIR = @MKFONTDIR@
+MKFONTSCALE = @MKFONTSCALE@
+NMEDIT = @NMEDIT@
+OBJC = @OBJC@
+OBJCCLD = @OBJCCLD@
+OBJCDEPMODE = @OBJCDEPMODE@
+OBJCFLAGS = @OBJCFLAGS@
+OBJCLINK = @OBJCLINK@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
+OPENSSL_LIBS = @OPENSSL_LIBS@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PCIACCESS_CFLAGS = @PCIACCESS_CFLAGS@
+PCIACCESS_LIBS = @PCIACCESS_LIBS@
+PCI_TXT_IDS_PATH = @PCI_TXT_IDS_PATH@
+PERL = @PERL@
+PKG_CONFIG = @PKG_CONFIG@
+PROJECTROOT = @PROJECTROOT@
+PS2PDF = @PS2PDF@
+RANLIB = @RANLIB@
+RAWCPP = @RAWCPP@
+RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = @SED@
+SERVER_MISC_CONFIG_PATH = @SERVER_MISC_CONFIG_PATH@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
+SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
+STRIP = @STRIP@
+TSLIB_CFLAGS = @TSLIB_CFLAGS@
+TSLIB_LIBS = @TSLIB_LIBS@
+UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
+VENDOR_MAN_VERSION = @VENDOR_MAN_VERSION@
+VENDOR_NAME = @VENDOR_NAME@
+VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
+VENDOR_RELEASE = @VENDOR_RELEASE@
+VERSION = @VERSION@
+X11APP_ARCHS = @X11APP_ARCHS@
+X11EXAMPLES_DEP_CFLAGS = @X11EXAMPLES_DEP_CFLAGS@
+X11EXAMPLES_DEP_LIBS = @X11EXAMPLES_DEP_LIBS@
+XDMCP_CFLAGS = @XDMCP_CFLAGS@
+XDMCP_LIBS = @XDMCP_LIBS@
+XDMXCONFIG_DEP_CFLAGS = @XDMXCONFIG_DEP_CFLAGS@
+XDMXCONFIG_DEP_LIBS = @XDMXCONFIG_DEP_LIBS@
+XDMX_CFLAGS = @XDMX_CFLAGS@
+XDMX_LIBS = @XDMX_LIBS@
+XDMX_SYS_LIBS = @XDMX_SYS_LIBS@
+XEGLMODULES_CFLAGS = @XEGLMODULES_CFLAGS@
+XEGL_LIBS = @XEGL_LIBS@
+XEGL_SYS_LIBS = @XEGL_SYS_LIBS@
+XEPHYR_CFLAGS = @XEPHYR_CFLAGS@
+XEPHYR_DRI_LIBS = @XEPHYR_DRI_LIBS@
+XEPHYR_INCS = @XEPHYR_INCS@
+XEPHYR_LIBS = @XEPHYR_LIBS@
+XF86CONFIGFILE = @XF86CONFIGFILE@
+XF86MISC_CFLAGS = @XF86MISC_CFLAGS@
+XF86MISC_LIBS = @XF86MISC_LIBS@
+XF86VIDMODE_CFLAGS = @XF86VIDMODE_CFLAGS@
+XF86VIDMODE_LIBS = @XF86VIDMODE_LIBS@
+XGLMODULES_CFLAGS = @XGLMODULES_CFLAGS@
+XGLMODULES_LIBS = @XGLMODULES_LIBS@
+XGLXMODULES_CFLAGS = @XGLXMODULES_CFLAGS@
+XGLXMODULES_LIBS = @XGLXMODULES_LIBS@
+XGLX_LIBS = @XGLX_LIBS@
+XGLX_SYS_LIBS = @XGLX_SYS_LIBS@
+XGL_LIBS = @XGL_LIBS@
+XGL_MODULE_PATH = @XGL_MODULE_PATH@
+XGL_SYS_LIBS = @XGL_SYS_LIBS@
+XKB_BASE_DIRECTORY = @XKB_BASE_DIRECTORY@
+XKB_BIN_DIRECTORY = @XKB_BIN_DIRECTORY@
+XKB_COMPILED_DIR = @XKB_COMPILED_DIR@
+XKM_OUTPUT_DIR = @XKM_OUTPUT_DIR@
+XLIB_CFLAGS = @XLIB_CFLAGS@
+XLIB_LIBS = @XLIB_LIBS@
+XNESTMODULES_CFLAGS = @XNESTMODULES_CFLAGS@
+XNESTMODULES_LIBS = @XNESTMODULES_LIBS@
+XNEST_LIBS = @XNEST_LIBS@
+XNEST_SYS_LIBS = @XNEST_SYS_LIBS@
+XORGCFG_DEP_CFLAGS = @XORGCFG_DEP_CFLAGS@
+XORGCFG_DEP_LIBS = @XORGCFG_DEP_LIBS@
+XORGCONFIG_DEP_CFLAGS = @XORGCONFIG_DEP_CFLAGS@
+XORGCONFIG_DEP_LIBS = @XORGCONFIG_DEP_LIBS@
+XORG_CFLAGS = @XORG_CFLAGS@
+XORG_INCS = @XORG_INCS@
+XORG_LIBS = @XORG_LIBS@
+XORG_MODULES_CFLAGS = @XORG_MODULES_CFLAGS@
+XORG_MODULES_LIBS = @XORG_MODULES_LIBS@
+XORG_OS = @XORG_OS@
+XORG_OS_SUBDIR = @XORG_OS_SUBDIR@
+XORG_SYS_LIBS = @XORG_SYS_LIBS@
+XPRINTMODULES_CFLAGS = @XPRINTMODULES_CFLAGS@
+XPRINTMODULES_LIBS = @XPRINTMODULES_LIBS@
+XPRINTPROTO_CFLAGS = @XPRINTPROTO_CFLAGS@
+XPRINTPROTO_LIBS = @XPRINTPROTO_LIBS@
+XPRINT_CFLAGS = @XPRINT_CFLAGS@
+XPRINT_LIBS = @XPRINT_LIBS@
+XPRINT_SYS_LIBS = @XPRINT_SYS_LIBS@
+XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
+XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
+XSDL_INCS = @XSDL_INCS@
+XSDL_LIBS = @XSDL_LIBS@
+XSERVERCFLAGS_CFLAGS = @XSERVERCFLAGS_CFLAGS@
+XSERVERCFLAGS_LIBS = @XSERVERCFLAGS_LIBS@
+XSERVERLIBS_CFLAGS = @XSERVERLIBS_CFLAGS@
+XSERVERLIBS_LIBS = @XSERVERLIBS_LIBS@
+XSERVER_LIBS = @XSERVER_LIBS@
+XSERVER_SYS_LIBS = @XSERVER_SYS_LIBS@
+XTSTEXAMPLES_DEP_CFLAGS = @XTSTEXAMPLES_DEP_CFLAGS@
+XTSTEXAMPLES_DEP_LIBS = @XTSTEXAMPLES_DEP_LIBS@
+XVFB_LIBS = @XVFB_LIBS@
+XVFB_SYS_LIBS = @XVFB_SYS_LIBS@
+XWINMODULES_CFLAGS = @XWINMODULES_CFLAGS@
+XWINMODULES_LIBS = @XWINMODULES_LIBS@
+XWIN_LIBS = @XWIN_LIBS@
+XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
+XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
+__XCONFIGFILE__ = @__XCONFIGFILE__@
+abi_ansic = @abi_ansic@
+abi_extension = @abi_extension@
+abi_font = @abi_font@
+abi_videodrv = @abi_videodrv@
+abi_xinput = @abi_xinput@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+driverdir = @driverdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+extdir = @extdir@
+ft_config = @ft_config@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+launchagentsdir = @launchagentsdir@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+logdir = @logdir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+moduledir = @moduledir@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sdkdir = @sdkdir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+xglmoduledir = @xglmoduledir@
+xpconfigdir = @xpconfigdir@
+INCLUDES = \
+	@KDRIVE_INCS@				\
+	-I$(top_srcdir)/hw/kdrive/vesa		\
+	@KDRIVE_CFLAGS@
+
+noinst_LIBRARIES = libchips.a
+libchips_a_SOURCES = \
+	chipsdraw.c	\
+	chips.c		\
+	chips.h	
+
+Xchips_SOURCES = \
+	chipsstub.c
+
+CHIPS_LIBS = \
+	libchips.a 				 \
+	$(top_builddir)/hw/kdrive/vesa/libvesa.a \
+	@KDRIVE_LIBS@
+
+@GLX_TRUE@Xchips_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
+Xchips_LDADD = \
+	$(CHIPS_LIBS)				\
+	@KDRIVE_LIBS@
+
+Xchips_DEPENDENCIES = \
+	libchips.a 				 \
+	@KDRIVE_LOCAL_LIBS@
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  hw/kdrive/chips/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign  hw/kdrive/chips/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+clean-noinstLIBRARIES:
+	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+libchips.a: $(libchips_a_OBJECTS) $(libchips_a_DEPENDENCIES) 
+	-rm -f libchips.a
+	$(libchips_a_AR) libchips.a $(libchips_a_OBJECTS) $(libchips_a_LIBADD)
+	$(RANLIB) libchips.a
+install-binPROGRAMS: $(bin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  if test -f $$p \
+	     || test -f $$p1 \
+	  ; then \
+	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
+	  else :; fi; \
+	done
+
+uninstall-binPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
+	done
+
+clean-binPROGRAMS:
+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  echo " rm -f $$p $$f"; \
+	  rm -f $$p $$f ; \
+	done
+Xchips$(EXEEXT): $(Xchips_OBJECTS) $(Xchips_DEPENDENCIES) 
+	@rm -f Xchips$(EXEEXT)
+	$(Xchips_LINK) $(Xchips_OBJECTS) $(Xchips_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chips.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chipsdraw.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chipsstub.Po@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LIBRARIES) $(PROGRAMS)
+installdirs:
+	for dir in "$(DESTDIR)$(bindir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-binPROGRAMS clean-generic clean-libtool \
+	clean-noinstLIBRARIES mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-exec-am: install-binPROGRAMS
+
+install-html: install-html-am
+
+install-info: install-info-am
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-binPROGRAMS
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
+	clean-generic clean-libtool clean-noinstLIBRARIES ctags \
+	distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-binPROGRAMS \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags uninstall uninstall-am uninstall-binPROGRAMS
+
+
+relink:
+	rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS)
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/xorg-server/hw/kdrive/chips/chips.c b/xorg-server/hw/kdrive/chips/chips.c
new file mode 100644
index 000000000..b419863eb
--- /dev/null
+++ b/xorg-server/hw/kdrive/chips/chips.c
@@ -0,0 +1,334 @@
+/*
+ * Copyright © 2001 Keith Packard
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of Keith Packard not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Keith Packard makes no
+ * representations about the suitability of this software for any purpose.  It
+ * is provided "as is" without express or implied warranty.
+ *
+ * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <kdrive-config.h>
+#endif
+#include "chips.h"
+#include "kaa.h"
+#include <sys/io.h>
+
+#undef CHIPS_DEBUG
+
+static Bool
+chipsCardInit (KdCardInfo *card)
+{
+    ChipsCardInfo	*chipsc;
+
+    chipsc = (ChipsCardInfo *) xalloc (sizeof (ChipsCardInfo));
+    if (!chipsc)
+	return FALSE;
+    
+    iopl (3);
+    
+    if (!vesaInitialize (card, &chipsc->vesa))
+    {
+	xfree (chipsc);
+	return FALSE;
+    }
+    
+#ifdef USE_PCI
+    chipsc->window = (CARD32 *) (chipsc->cop_base + 0x10000);
+#else
+    chipsc->window = 0;
+#endif
+    card->driver = chipsc;
+    
+    return TRUE;
+}
+
+static Bool
+chipsScreenInit (KdScreenInfo *screen)
+{
+    ChipsScreenInfo	*chipss;
+    int			screen_size, memory;
+
+    chipss = (ChipsScreenInfo *) xalloc (sizeof (ChipsScreenInfo));
+    if (!chipss)
+	return FALSE;
+    memset (chipss, '\0', sizeof (ChipsScreenInfo));
+    if (!vesaScreenInitialize (screen, &chipss->vesa))
+    {
+	xfree (chipss);
+	return FALSE;
+    }
+
+    if (chipss->vesa.mapping != VESA_LINEAR)
+	screen->dumb = TRUE;
+    if (!screen->dumb)
+    {
+	chipss->mmio_base = (CARD8 *) KdMapDevice (CHIPS_MMIO_BASE(chipss),
+						   CHIPS_MMIO_SIZE(chipss));
+	
+	if (chipss->mmio_base)
+	{
+	    KdSetMappedMode (CHIPS_MMIO_BASE(chipss),
+			     CHIPS_MMIO_SIZE(chipss),
+			     KD_MAPPED_MODE_REGISTERS);
+	}
+	else
+	    screen->dumb = TRUE;
+    }
+    else
+	chipss->mmio_base = 0;
+
+    chipss->screen = chipss->vesa.fb;
+    memory = chipss->vesa.fb_size;
+    
+    screen_size = screen->fb[0].byteStride * screen->height;
+    
+    if (chipss->screen && memory >= screen_size + 2048)
+    {
+	memory -= 2048;
+	chipss->cursor_base = chipss->screen + memory - 2048;
+    }
+    else
+	chipss->cursor_base = 0;
+    memory -= screen_size;
+    if (memory > screen->fb[0].byteStride)
+    {
+	chipss->off_screen = chipss->screen + screen_size;
+	chipss->off_screen_size = memory;
+    }
+    else
+    {
+	chipss->off_screen = 0;
+	chipss->off_screen_size = 0;
+    }
+    screen->driver = chipss;
+    return TRUE;
+}
+
+static Bool
+chipsInitScreen (ScreenPtr pScreen)
+{
+    return vesaInitScreen (pScreen);
+}
+
+#ifdef RANDR
+static Bool
+chipsRandRSetConfig (ScreenPtr		pScreen,
+		      Rotation		rotation,
+		      int		rate,
+		      RRScreenSizePtr	pSize)
+{
+    kaaWaitSync (pScreen);
+
+    if (!vesaRandRSetConfig (pScreen, rotation, rate, pSize))
+	return FALSE;
+    
+    return TRUE;
+}
+
+static void
+chipsRandRInit (ScreenPtr pScreen)
+{
+    rrScrPriv(pScreen);
+
+    pScrPriv->rrSetConfig = chipsRandRSetConfig;
+}
+#endif
+
+static Bool
+chipsFinishInitScreen (ScreenPtr pScreen)
+{
+    Bool    ret;
+    ret = vesaFinishInitScreen (pScreen);
+#ifdef RANDR
+    chipsRandRInit (pScreen);
+#endif
+    return ret;
+}
+
+static Bool
+chipsCreateResources (ScreenPtr pScreen)
+{
+    return vesaCreateResources (pScreen);
+}
+
+CARD8
+chipsReadXR (ChipsScreenInfo *chipss, CARD8 index)
+{
+    CARD8 value;
+    outb (index, 0x3d6);
+    value = inb (0x3d7);
+    return value;
+}
+
+void
+chipsWriteXR (ChipsScreenInfo *chipss, CARD8 index, CARD8 value)
+{
+    outb (index, 0x3d6);
+    outb (value, 0x3d7);
+}
+
+#if 0
+static CARD8
+chipsReadFR (ChipsScreenInfo *chipss, CARD8 index)
+{
+    CARD8 value;
+    outb (index, 0x3d0);
+    value = inb (0x3d1);
+    return value;
+}
+
+static void
+chipsWriteFR (ChipsScreenInfo *chipss, CARD8 index, CARD8 value)
+{
+    outb (index, 0x3d0);
+    outb (value, 0x3d1);
+}
+
+static CARD8
+chipsReadSeq (ChipsScreenInfo *chipss, CARD8 index)
+{
+    CARD8   value;
+    outb (index, 0x3c4);
+    value = inb (0x3c5);
+    return value;
+}
+
+static void
+chipsWriteSeq (ChipsScreenInfo *chipss, CARD8 index, CARD8 value)
+{
+    outb (index, 0x3c4);
+    outb (value, 0x3c5);
+}
+#endif
+
+static void
+chipsPreserve (KdCardInfo *card)
+{
+    vesaPreserve(card);
+}
+
+static void
+chipsSetMMIO (ChipsCardInfo *chipsc)
+{
+}
+
+static void
+chipsResetMMIO (ChipsCardInfo *chipsc)
+{
+}
+
+static Bool
+chipsEnable (ScreenPtr pScreen)
+{
+    KdScreenPriv(pScreen);
+    ChipsCardInfo	*chipsc = pScreenPriv->card->driver;
+
+    if (!vesaEnable (pScreen))
+	return FALSE;
+    chipsSetMMIO (chipsc);
+    return TRUE;
+}
+
+#if 0
+static Bool
+chipsDPMS (ScreenPtr pScreen, int mode)
+{
+    KdScreenPriv(pScreen);
+    chipsScreenInfo(pScreenPriv);
+    
+    ErrorF ("seqreg 0x01 0x%x\n", chipsReadSeq (chipss, 0x1));
+    ErrorF ("dpmsreg XR61 0x%x\n", chipsReadXR (chipss, 0x61));
+    ErrorF ("dpmsreg XR73 0x%x\n", chipsReadXR (chipss, 0x73));
+    
+    ErrorF ("flat panel FR05 0x%x\n", chipsReadFR (chipss, 0x5));
+    ErrorF ("flat panel XR52 0x%x\n", chipsReadXR (chipss, 0x52));
+    return TRUE;
+}
+#endif
+
+static void
+chipsDisable (ScreenPtr pScreen)
+{
+    vesaDisable (pScreen);
+}
+
+static void
+chipsRestore (KdCardInfo *card)
+{
+    ChipsCardInfo	*chipsc = card->driver;
+
+    chipsResetMMIO (chipsc);
+    vesaRestore (card);
+}
+
+static void
+chipsScreenFini (KdScreenInfo *screen)
+{
+    ChipsScreenInfo	*chipss = (ChipsScreenInfo *) screen->driver;
+
+    if (chipss->mmio_base)
+    {
+	KdUnmapDevice ((void *) chipss->mmio_base, CHIPS_MMIO_SIZE(chipss));
+	KdResetMappedMode (CHIPS_MMIO_BASE(chipss),
+			   CHIPS_MMIO_SIZE(chipss),
+			   KD_MAPPED_MODE_REGISTERS);
+    }
+    vesaScreenFini (screen);
+    xfree (chipss);
+    screen->driver = 0;
+}
+
+static void
+chipsCardFini (KdCardInfo *card)
+{
+    vesaCardFini (card);
+}
+
+#define chipsCursorInit	(void *) 0
+#define chipsCursorEnable	(void *) 0
+#define chipsCursorDisable	(void *) 0
+#define chipsCursorFini	(void *) 0
+#define chipsRecolorCursor	(void *) 0
+
+KdCardFuncs	chipsFuncs = {
+    chipsCardInit,	    /* cardinit */
+    chipsScreenInit,	    /* scrinit */
+    chipsInitScreen,	    /* initScreen */
+    chipsFinishInitScreen,  /* finishInitScreen */
+    chipsCreateResources,   /* createRes */
+    chipsPreserve,	    /* preserve */
+    chipsEnable,	    /* enable */
+    vesaDPMS,		    /* dpms */
+    chipsDisable,	    /* disable */
+    chipsRestore,	    /* restore */
+    chipsScreenFini,	    /* scrfini */
+    chipsCardFini,	    /* cardfini */
+    
+    chipsCursorInit,	    /* initCursor */
+    chipsCursorEnable,    /* enableCursor */
+    chipsCursorDisable,   /* disableCursor */
+    chipsCursorFini,	    /* finiCursor */
+    chipsRecolorCursor,   /* recolorCursor */
+    
+    chipsDrawInit,        /* initAccel */
+    chipsDrawEnable,      /* enableAccel */
+    chipsDrawDisable,     /* disableAccel */
+    chipsDrawFini,        /* finiAccel */
+    
+    vesaGetColors,    	    /* getColors */
+    vesaPutColors,	    /* putColors */
+};
diff --git a/xorg-server/hw/kdrive/chips/chips.h b/xorg-server/hw/kdrive/chips/chips.h
new file mode 100644
index 000000000..6ad17fe25
--- /dev/null
+++ b/xorg-server/hw/kdrive/chips/chips.h
@@ -0,0 +1,117 @@
+/*
+ * Copyright © 1999 Keith Packard
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of Keith Packard not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Keith Packard makes no
+ * representations about the suitability of this software for any purpose.  It
+ * is provided "as is" without express or implied warranty.
+ *
+ * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef _CHIPS_H_
+#define _CHIPS_H_
+#include <vesa.h>
+
+/*
+ * offset from ioport beginning 
+ */
+
+#define HIQV
+#ifdef HIQV
+#define CHIPS_MMIO_BASE(c)	((c)->vesa.fb_phys + 0x400000)
+#else
+#define CHIPS_MMIO_BASE(c)	((c)->vesa.fb_phys + 0x200000)
+#endif
+#define CHIPS_MMIO_SIZE(c)	(0x20000)
+
+typedef volatile CARD8	VOL8;
+typedef volatile CARD16	VOL16;
+typedef volatile CARD32	VOL32;
+
+typedef struct _chipsSave {
+    int	    dummy;
+} ChipsSave;
+
+typedef struct _chipsCardInfo {
+    VesaCardPrivRec	vesa;
+    CARD32		*window;
+    Bool		mmio;
+    ChipsSave		save;
+} ChipsCardInfo;
+    
+#define getChipsCardInfo(kd)  ((ChipsCardInfo *) ((kd)->card->driver))
+#define chipsCardInfo(kd)	    ChipsCardInfo	*chipsc = getChipsCardInfo(kd)
+
+typedef struct _chipsCursor {
+    int		width, height;
+    int		xhot, yhot;
+    Bool	has_cursor;
+    CursorPtr	pCursor;
+    Pixel	source, mask;
+} ChipsCursor;
+
+#define CHIPS_CURSOR_WIDTH	64
+#define CHIPS_CURSOR_HEIGHT	64
+
+typedef struct _chipsScreenInfo {
+    VesaScreenPrivRec	vesa;
+    CARD8	    *mmio_base;
+    CARD8	    *cursor_base;
+    CARD8	    *screen;
+    CARD8	    *off_screen;
+    int		    off_screen_size;
+    ChipsCursor   cursor;
+    KaaScreenInfoRec kaa;
+} ChipsScreenInfo;
+
+#define getChipsScreenInfo(kd) ((ChipsScreenInfo *) ((kd)->screen->driver))
+#define chipsScreenInfo(kd)    ChipsScreenInfo *chipss = getChipsScreenInfo(kd)
+
+Bool
+chipsDrawInit (ScreenPtr pScreen);
+
+void
+chipsDrawEnable (ScreenPtr pScreen);
+
+void
+chipsDrawDisable (ScreenPtr pScreen);
+
+void
+chipsDrawFini (ScreenPtr pScreen);
+
+CARD8
+chipsReadXR (ChipsScreenInfo *chipsc, CARD8 index);
+
+void
+chipsWriteXR (ChipsScreenInfo *chipsc, CARD8 index, CARD8 value);
+
+Bool
+chipsCursorInit (ScreenPtr pScreen);
+
+void
+chipsCursorEnable (ScreenPtr pScreen);
+
+void
+chipsCursorDisable (ScreenPtr pScreen);
+
+void
+chipsCursorFini (ScreenPtr pScreen);
+
+void
+chipsRecolorCursor (ScreenPtr pScreen, int ndef, xColorItem *pdef);
+
+extern KdCardFuncs  chipsFuncs;
+
+#endif /* _CHIPS_H_ */
diff --git a/xorg-server/hw/kdrive/chips/chipsdraw.c b/xorg-server/hw/kdrive/chips/chipsdraw.c
new file mode 100644
index 000000000..b1c35f901
--- /dev/null
+++ b/xorg-server/hw/kdrive/chips/chipsdraw.c
@@ -0,0 +1,491 @@
+/*
+ * Copyright © 1999 Keith Packard
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of Keith Packard not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Keith Packard makes no
+ * representations about the suitability of this software for any purpose.  It
+ * is provided "as is" without express or implied warranty.
+ *
+ * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <kdrive-config.h>
+#endif
+#include "chips.h"
+
+#include	<X11/Xmd.h>
+#include	"gcstruct.h"
+#include	"scrnintstr.h"
+#include	"pixmapstr.h"
+#include	"regionstr.h"
+#include	"mistruct.h"
+#include	"dixfontstr.h"
+#include	"fb.h"
+#include	"migc.h"
+#include	"miline.h"
+#include	"kaa.h"
+
+CARD8 chipsBltRop[16] = {
+    /* GXclear      */      0x00,         /* 0 */
+    /* GXand        */      0x88,         /* src AND dst */
+    /* GXandReverse */      0x44,         /* src AND NOT dst */
+    /* GXcopy       */      0xcc,         /* src */
+    /* GXandInverted*/      0x22,         /* NOT src AND dst */
+    /* GXnoop       */      0xaa,         /* dst */
+    /* GXxor        */      0x66,         /* src XOR dst */
+    /* GXor         */      0xee,         /* src OR dst */
+    /* GXnor        */      0x11,         /* NOT src AND NOT dst */
+    /* GXequiv      */      0x99,         /* NOT src XOR dst */
+    /* GXinvert     */      0x55,         /* NOT dst */
+    /* GXorReverse  */      0xdd,         /* src OR NOT dst */
+    /* GXcopyInverted*/     0x33,         /* NOT src */
+    /* GXorInverted */      0xbb,         /* NOT src OR dst */
+    /* GXnand       */      0x77,         /* NOT src OR NOT dst */
+    /* GXset        */      0xff,         /* 1 */
+};
+
+CARD8 chipsSolidRop[16] = {
+    /* GXclear      */      0x00,         /* 0 */
+    /* GXand        */      0xa0,         /* src AND dst */
+    /* GXandReverse */      0x50,         /* src AND NOT dst */
+    /* GXcopy       */      0xf0,         /* src */
+    /* GXandInverted*/      0x0a,         /* NOT src AND dst */
+    /* GXnoop       */      0xaa,         /* dst */
+    /* GXxor        */      0x5a,         /* src XOR dst */
+    /* GXor         */      0xfa,         /* src OR dst */
+    /* GXnor        */      0x05,         /* NOT src AND NOT dst */
+    /* GXequiv      */      0xa5,         /* NOT src XOR dst */
+    /* GXinvert     */      0x55,         /* NOT dst */
+    /* GXorReverse  */      0xf5,         /* src OR NOT dst */
+    /* GXcopyInverted*/     0x0f,         /* NOT src */
+    /* GXorInverted */      0xaf,         /* NOT src OR dst */
+    /* GXnand       */      0x5f,         /* NOT src OR NOT dst */
+    /* GXset        */      0xff,         /* 1 */
+};
+
+/* Definitions for the Chips and Technology BitBLT engine communication. */
+/* These are done using Memory Mapped IO, of the registers */
+/* BitBLT modes for register 93D0. */
+
+#ifdef HIQV
+#define ctPATCOPY               0xF0
+#define ctLEFT2RIGHT            0x000
+#define ctRIGHT2LEFT            0x100
+#define ctTOP2BOTTOM            0x000
+#define ctBOTTOM2TOP            0x200
+#define ctSRCSYSTEM             0x400
+#define ctDSTSYSTEM             0x800
+#define ctSRCMONO               0x1000
+#define ctBGTRANSPARENT         0x22000
+#define ctCOLORTRANSENABLE      0x4000
+#define ctCOLORTRANSDISABLE     0x0
+#define ctCOLORTRANSDST         0x8000
+#define ctCOLORTRANSROP         0x0
+#define ctCOLORTRANSEQUAL       0x10000L
+#define ctCOLORTRANSNEQUAL      0x0
+#define ctPATMONO               0x40000L
+#define ctPATSOLID              0x80000L
+#define ctPATSTART0             0x000000L
+#define ctPATSTART1             0x100000L
+#define ctPATSTART2             0x200000L
+#define ctPATSTART3             0x300000L
+#define ctPATSTART4             0x400000L
+#define ctPATSTART5             0x500000L
+#define ctPATSTART6             0x600000L
+#define ctPATSTART7             0x700000L
+#define ctSRCFG                 0x000000L	/* Where is this for the 65550?? */
+#else
+#define ctPATCOPY               0xF0
+#define ctTOP2BOTTOM            0x100
+#define ctBOTTOM2TOP            0x000
+#define ctLEFT2RIGHT            0x200
+#define ctRIGHT2LEFT            0x000
+#define ctSRCFG                 0x400
+#define ctSRCMONO               0x800
+#define ctPATMONO               0x1000
+#define ctBGTRANSPARENT         0x2000
+#define ctSRCSYSTEM             0x4000
+#define ctPATSOLID              0x80000L
+#define ctPATSTART0             0x00000L
+#define ctPATSTART1             0x10000L
+#define ctPATSTART2             0x20000L
+#define ctPATSTART3             0x30000L
+#define ctPATSTART4             0x40000L
+#define ctPATSTART5             0x50000L
+#define ctPATSTART6             0x60000L
+#define ctPATSTART7             0x70000L
+#endif
+
+#define chipsFillPix(bpp,pixel) {\
+    if (bpp == 8) \
+    { \
+	pixel = pixel & 0xff; \
+    } \
+    else if (bpp == 16) \
+    { \
+	pixel = pixel & 0xffff; \
+    } \
+}
+
+static VOL8	*mmio;
+static CARD32	byteStride;
+static CARD32	bytesPerPixel;
+static CARD32	pixelStride;
+
+static void
+chipsSet (ScreenPtr pScreen)
+{
+    KdScreenPriv(pScreen);
+    chipsScreenInfo(pScreenPriv);
+    
+    mmio = chipss->mmio_base;
+    byteStride = pScreenPriv->screen->fb[0].byteStride;
+    bytesPerPixel = pScreenPriv->screen->fb[0].bitsPerPixel >> 3;
+    pixelStride = pScreenPriv->screen->fb[0].pixelStride;
+}
+
+#ifdef HIQV
+#define CHIPS_BR0	0x00	/* offset */
+#define CHIPS_BR1    	0x04	/* bg */
+#define CHIPS_BR2    	0x08	/* fg */
+#define CHIPS_BR3    	0x0c	/* monochrome */
+#define CHIPS_BR4	0x10	/* bitblt */
+#define CHIPS_BR5	0x14	/* pattern addr */
+#define CHIPS_BR6	0x18	/* source addr */
+#define CHIPS_BR7	0x1c	/* dst addr */
+#define CHIPS_BR8	0x20	/* dst w/h */
+#else
+#define CHIPS_DR0	0x83d0
+#define CHIPS_DR1    	0x87d0
+#define CHIPS_DR2    	0x8bd0
+#define CHIPS_DR3    	0x8fd0
+#define CHIPS_DR4	0x93d0
+#define CHIPS_DR5	0x97d0
+#define CHIPS_DR6	0x9bd0
+#define CHIPS_DR7	0x9fd0
+#endif
+
+#define DBG(x)
+
+static void
+chipsPitch (int src, int dst)
+{
+    CARD32  p;
+
+    p = ((dst & 0xffff) << 16) | (src & 0xffff);
+    DBG(ErrorF ("\tpitch 0x%x\n", p));
+#ifdef HIQV
+    *(VOL32 *) (mmio + CHIPS_BR0) = p;
+#else
+    *(VOL32 *) (mmio + CHIPS_DR0) = p;
+#endif
+}
+
+static void
+chipsBg (Pixel   bg)
+{
+    DBG(ErrorF ("\tbg 0x%x\n", bg));
+#ifdef HIQV
+    *(VOL32 *) (mmio + CHIPS_BR1) = bg & 0xffff;
+#else
+    *(VOL32 *) (mmio + CHIPS_DR2) = bg;
+#endif
+}
+
+static void
+chipsFg (Pixel   fg)
+{
+    DBG(ErrorF ("\tfg 0x%x\n", fg));
+#ifdef HIQV
+    *(VOL32 *) (mmio + CHIPS_BR2) = fg;
+#else
+    *(VOL32 *) (mmio + CHIPS_DR3) = fg;
+#endif
+}
+
+static void
+chipsOp (CARD32 op)
+{
+    DBG(ErrorF ("\top 0x%x\n", op));
+#ifdef HIQV
+    *(VOL32 *) (mmio + CHIPS_BR4) = op;
+#else
+    *(VOL32 *) (mmio + CHIPS_DR4) = op;
+#endif
+}
+    
+static void
+chipsRopSolid (int rop)
+{
+    CARD32  op;
+    
+    op = chipsSolidRop[rop] | ctTOP2BOTTOM | ctLEFT2RIGHT | ctPATSOLID | ctPATMONO;
+    chipsOp (op);
+}
+
+static void
+chipsSrc (int addr)
+{
+    DBG(ErrorF ("\tsrc 0x%x\n", addr));
+#ifdef HIQV
+    *(VOL32 *) (mmio + CHIPS_BR6) = addr;
+#else
+    *(VOL32 *) (mmio + CHIPS_DR5) = addr;
+#endif
+}
+
+static void
+chipsDst (int addr)
+{
+    DBG(ErrorF ("\tdst 0x%x\n", addr));
+#ifdef HIQV
+    *(VOL32 *) (mmio + CHIPS_BR7) = addr;
+#else
+    *(VOL32 *) (mmio + CHIPS_DR6) = addr;
+#endif
+}
+
+static void
+chipsWidthHeightGo (int w, int h)
+{
+    DBG(ErrorF ("\twidth height %d/%d\n", w, h));
+#ifdef HIQV
+    *(VOL32 *) (mmio + CHIPS_BR8) = ((h & 0xffff) << 16) | (w & 0xffff);
+#else
+    *(VOL32 *) (mmio + CHIPS_DR7) = ((h & 0xffff) << 16) | (w & 0xffff);
+#endif
+}
+
+static void
+chipsWaitIdle (void)
+{
+#ifdef HIQV
+    int	timeout = 0;
+    CARD8   tmp;
+    VOL32   *br4 = (VOL32 *) (mmio + CHIPS_BR4);
+    
+    DBG(ErrorF ("\tBR4 0x%x 0x%x\n", mmio + CHIPS_BR4, *br4));
+    DBG(ErrorF ("\tXR20 0x%x\n", chipsReadXR (0, 0x20)));
+    for (;;)
+    {
+	if ((*br4 & 0x80000000) == 0)
+	    break;
+	tmp = chipsReadXR (0, 0x20);
+	if ((tmp & 1) == 0)
+	    break;
+	if (++timeout > 1000000)
+	{
+	    ErrorF ("timeout\n");
+	    tmp = chipsReadXR (0, 0x20);
+	    chipsWriteXR (0, 0x20, tmp | 2);
+	    sleep (1);
+	    chipsWriteXR (0, 0x20, tmp);
+	    sleep (1);
+	}
+    }
+#else
+    while (*(VOL32 *) (mmio + CHIPS_DR4) & 0x00100000)
+	;
+#endif
+}
+
+static void
+chipsWaitMarker (ScreenPtr pScreen, int marker)
+{
+    chipsSet (pScreen);
+    chipsWaitIdle ();
+}
+
+static Bool
+chipsPrepareSolid (PixmapPtr	pPixmap,
+		   int		alu,
+		   Pixel	pm,
+		   Pixel	fg)
+{
+    FbBits  depthMask;
+    
+    DBG(ErrorF ("PrepareSolid %d 0x%x\n", alu, fg));
+    depthMask = FbFullMask(pPixmap->drawable.depth);
+    if ((pm & depthMask) != depthMask)
+	return FALSE;
+    else
+    {
+	chipsSet (pPixmap->drawable.pScreen);
+	chipsWaitIdle ();
+	chipsFillPix(pPixmap->drawable.bitsPerPixel,fg);
+	chipsFg (fg);
+	chipsBg (fg);
+	chipsRopSolid (alu);
+	chipsPitch (byteStride, byteStride);
+	return TRUE;
+    }
+}
+
+static void
+chipsSolid (int x1, int y1, int x2, int y2)
+{
+    CARD32  dst;
+    int	    w, h;
+
+    DBG(ErrorF ("    Solid %dx%d %dx%d\n", x1, y1, x2, y2));
+    dst = y1 * byteStride + x1 * bytesPerPixel;
+    w = (x2 - x1) * bytesPerPixel;
+    h = (y2 - y1);
+    chipsWaitIdle ();
+    chipsDst (dst);
+    chipsWidthHeightGo (w, h);
+}
+
+static void
+chipsDoneSolid (void)
+{
+}
+
+static CARD32	copyOp;
+
+static Bool
+chipsPrepareCopy (PixmapPtr	pSrcPixmap,
+		  PixmapPtr	pDstPixmap,
+		  int		dx,
+		  int		dy,
+		  int		alu,
+		  Pixel		pm)
+{
+    FbBits  depthMask;
+    
+    DBG(ErrorF ("PrepareSolid %d 0x%x\n", alu, fg));
+    depthMask = FbFullMask(pDstPixmap->drawable.depth);
+    if ((pm & depthMask) != depthMask)
+	return FALSE;
+    else
+    {
+	copyOp = chipsBltRop[alu];
+	if (dy >= 0)
+	    copyOp |= ctTOP2BOTTOM;
+	else
+	    copyOp |= ctBOTTOM2TOP;
+	if (dx >= 0)
+	    copyOp |= ctLEFT2RIGHT;
+	else
+	    copyOp |= ctRIGHT2LEFT;
+	chipsSet (pDstPixmap->drawable.pScreen);
+	chipsWaitIdle ();
+	chipsOp (copyOp);
+	chipsPitch (byteStride, byteStride);
+	return TRUE;
+    }
+}
+
+static void
+chipsCopy (int srcX,
+	   int srcY,
+	   int dstX,
+	   int dstY,
+	   int w,
+	   int h)
+{
+    int	src, dst;
+    if ((copyOp & (ctTOP2BOTTOM|ctBOTTOM2TOP)) == ctBOTTOM2TOP)
+    {
+	src = (srcY + h - 1) * byteStride;
+	dst = (dstY + h - 1) * byteStride;
+    }
+    else
+    {
+	src = srcY * byteStride;
+	dst = dstY * byteStride;
+    }
+    if ((copyOp & (ctLEFT2RIGHT|ctRIGHT2LEFT)) == ctRIGHT2LEFT)
+    {
+	src = src + (srcX + w) * bytesPerPixel - 1;
+	dst = dst + (dstX + w) * bytesPerPixel - 1;
+    }
+    else
+    {
+	src = src + srcX * bytesPerPixel;
+	dst = dst + dstX * bytesPerPixel;
+    }
+    chipsWaitIdle ();
+    chipsSrc (src);
+    chipsDst (dst);
+    chipsWidthHeightGo (w * bytesPerPixel, h);
+}
+
+static void
+chipsDoneCopy (void)
+{
+}
+
+Bool
+chipsDrawInit (ScreenPtr pScreen)
+{
+    KdScreenPriv(pScreen);
+    chipsScreenInfo(pScreenPriv);
+
+    switch (pScreenPriv->screen->fb[0].bitsPerPixel) {
+    case 8:
+    case 16:
+	break;
+    default:
+	return FALSE;
+    }
+	
+    memset(&chipss->kaa, 0, sizeof(KaaScreenInfoRec));
+    chipss->kaa.waitMarker	= chipsWaitMarker;
+    chipss->kaa.PrepareSolid	= chipsPrepareSolid;
+    chipss->kaa.Solid		= chipsSolid;
+    chipss->kaa.DoneSolid	= chipsDoneSolid;
+    chipss->kaa.PrepareCopy	= chipsPrepareCopy;
+    chipss->kaa.Copy		= chipsCopy;
+    chipss->kaa.DoneCopy	= chipsDoneCopy;
+
+    if (!kaaDrawInit (pScreen, &chipss->kaa))
+	return FALSE;
+    
+    return TRUE;
+}
+
+void
+chipsDrawEnable (ScreenPtr pScreen)
+{
+    KdScreenPriv(pScreen);
+    chipsScreenInfo(pScreenPriv);
+    CARD8 mode = 0x00;
+    
+    switch (pScreenPriv->screen->fb[0].bitsPerPixel) {
+    case 8:
+	mode = 0x00;
+	break;
+    case 16:
+	mode = 0x10;
+	break;
+    }
+    chipsSet (pScreen);
+    chipsWaitIdle ();
+    chipsWriteXR (chipss, 0x20, mode);
+    
+    kaaMarkSync (pScreen);
+}
+
+void
+chipsDrawDisable (ScreenPtr pScreen)
+{
+}
+
+void
+chipsDrawFini (ScreenPtr pScreen)
+{
+}
+
diff --git a/xorg-server/hw/kdrive/chips/chipsstub.c b/xorg-server/hw/kdrive/chips/chipsstub.c
new file mode 100644
index 000000000..9024a7d44
--- /dev/null
+++ b/xorg-server/hw/kdrive/chips/chipsstub.c
@@ -0,0 +1,67 @@
+/*
+ * Copyright 1999 SuSE, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of SuSE not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  SuSE makes no representations about the
+ * suitability of this software for any purpose.  It is provided "as is"
+ * without express or implied warranty.
+ *
+ * SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE
+ * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN 
+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Author:  Keith Packard, SuSE, Inc.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <kdrive-config.h>
+#endif
+#include "chips.h"
+
+extern int  chips_clk, chips_mclk;
+
+void
+InitCard (char *name)
+{
+    KdCardAttr	attr;
+
+    KdCardInfoAdd (&chipsFuncs, &attr, 0);
+}
+
+void
+InitOutput (ScreenInfo *pScreenInfo, int argc, char **argv)
+{
+    KdInitOutput (pScreenInfo, argc, argv);
+}
+
+void
+InitInput (int argc, char **argv)
+{
+    KdOsAddInputDrivers ();
+    KdInitInput ();
+}
+
+void
+ddxUseMsg (void)
+{
+    KdUseMsg();
+    vesaUseMsg();
+}
+
+int
+ddxProcessArgument (int argc, char **argv, int i)
+{
+    int	ret;
+    
+    if (!(ret = vesaProcessArgument (argc, argv, i)))
+	ret = KdProcessArgument(argc, argv, i);
+    return ret;
+}