libX11 libXext libXft mesa libxcb mkfontscale pixman xserver

xkeyboard-config git update 19 oct 2011

3 files changed, 290 insertions, 559 deletions

diff --git a/xorg-server/hw/xfree86/os-support/shared/bios_devmem.c b/xorg-server/hw/xfree86/os-support/shared/bios_devmem.c
deleted file mode 100644
index 4699fcb88..000000000
--- a/xorg-server/hw/xfree86/os-support/shared/bios_devmem.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/*

- * Copyright 1993 by David Wexelblat <dwex@goblin.org>

- *

- * 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 David Wexelblat not be used in

- * advertising or publicity pertaining to distribution of the software without

- * specific, written prior permission.  David Wexelblat makes no representations

- * about the suitability of this software for any purpose.  It is provided

- * "as is" without express or implied warranty.

- *

- * DAVID WEXELBLAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

- * EVENT SHALL DAVID WEXELBLAT 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_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include <X11/X.h>

-#include "xf86.h"

-#include "xf86Priv.h"

-#include "xf86_OSlib.h"

-#include <string.h>

-

-/*

- * Read BIOS via /dev/mem.

- */

-

-#ifndef DEV_MEM

-# define DEV_MEM "/dev/mem"

-#endif

-

-int

-xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf,

-		int Len)

-{

- 	int fd;

-

-#ifdef __ia64__

-	if ((fd = open(DEV_MEM, O_RDONLY | O_SYNC)) < 0)

-#else

- 	if ((fd = open(DEV_MEM, O_RDONLY)) < 0)

-#endif

-	{

-		xf86Msg(X_WARNING, "xf86ReadBIOS: Failed to open %s (%s)\n",

-			DEV_MEM, strerror(errno));

-		return -1;

-	}

-

-	if (lseek(fd, (Base+Offset), SEEK_SET) < 0)

-	{

-		xf86Msg(X_WARNING, "xf86ReadBIOS: %s seek failed (%s)\n",

-			DEV_MEM, strerror(errno));

-		close(fd);

-		return -1;

-	}

-	if (read(fd, Buf, Len) != Len)

-	{

-		xf86Msg(X_WARNING, "xf86ReadBIOS: %s read failed (%s)\n",

-			DEV_MEM, strerror(errno));

-		close(fd);

-		return -1;

-	}

-	close(fd);

-	return Len;

-}

diff --git a/xorg-server/hw/xfree86/os-support/shared/ia64Pci.c b/xorg-server/hw/xfree86/os-support/shared/ia64Pci.c
deleted file mode 100644
index c93c74c4a..000000000
--- a/xorg-server/hw/xfree86/os-support/shared/ia64Pci.c
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * Copyright (C) 2002-2003 The XFree86 Project, Inc.  All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
- * XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * Except as contained in this notice, the name of the XFree86 Project shall
- * not be used in advertising or otherwise to promote the sale, use or other
- * dealings in this Software without prior written authorization from the
- * XFree86 Project.
- */
-
-/*
- * This file contains the glue needed to support various IA-64 chipsets.
- */
-
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
-#include <fcntl.h>
-#include <unistd.h>
-#include <signal.h>
-#include <dirent.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-#include <linux/pci.h>
-
-#include "compiler.h"
-#include "Pci.h"
-
-/*
- * We use special in/out routines here since Altix platforms require the
- * use of the sysfs legacy_io interface.  The legacy_io file maps to the I/O
- * space of a given PCI domain; reads and writes are used to do port I/O.
- * The file descriptor for the file is stored in the upper bits of the
- * value passed in by the caller, and is created and populated by
- * xf86MapLegacyIO.
- *
- * If the legacy_io interface doesn't exist, we fall back to the glibc in/out
- * routines, which are prefixed by an underscore (e.g. _outb).
- */
-static int ia64_port_to_fd(unsigned long port)
-{
-    return (port >> 24) & 0xffffffff;
-}
-
-void outb(unsigned long port, unsigned char val)
-{
-    int fd = ia64_port_to_fd(port);
-
-    if (!fd) {
-	_outb(val, port & 0xffff);
-	goto out;
-    }
-    if (lseek(fd, port & 0xffff, SEEK_SET) == -1) {
-	ErrorF("I/O lseek failed\n");
-	goto out;
-    }
-    if (write(fd, &val, 1) != 1) {
-	ErrorF("I/O write failed\n");
-	goto out;
-    }
- out:
-    return;
-}
-
-void outw(unsigned long port, unsigned short val)
-{
-    int fd = ia64_port_to_fd(port);
-
-    if (!fd) {
-	_outw(val, port & 0xffff);
-	goto out;
-    }
-    if (lseek(fd, port & 0xffff, SEEK_SET) == -1) {
-	ErrorF("I/O lseek failed\n");
-	goto out;
-    }
-    if (write(fd, &val, 2) != 2) {
-	ErrorF("I/O write failed\n");
-	goto out;
-    }
- out:
-    return;
-}
-
-void outl(unsigned long port, unsigned int val)
-{
-    int fd = ia64_port_to_fd(port);
-
-    if (!fd) {
-	_outl(val, port & 0xffff);
-	goto out;
-    }
-    if (lseek(fd, port & 0xffff, SEEK_SET) == -1) {
-	ErrorF("I/O lseek failed\n");
-	goto out;
-    }
-    if (write(fd, &val, 4) != 4) {
-	ErrorF("I/O write failed\n");
-	goto out;
-    }
- out:
-    return;
-}
-
-unsigned int inb(unsigned long port)
-{
-    int fd = ia64_port_to_fd(port);
-    unsigned char val;
-
-    if (!fd)
-	return _inb(port & 0xffff);
-
-    if (lseek(fd, port & 0xffff, SEEK_SET) == -1) {
-	ErrorF("I/O lseek failed\n");
-	val = -1;
-	goto out;
-    }
-    if (read(fd, &val, 1) != 1) {
-	ErrorF("I/O read failed\n");
-	val = -1;
-	goto out;
-    }
- out:
-    return val;
-}
-
-unsigned int inw(unsigned long port)
-{
-    int fd = ia64_port_to_fd(port);
-    unsigned short val;
-
-    if (!fd)
-	return _inw(port & 0xffff);
-
-    if (lseek(fd, port & 0xffff, SEEK_SET) == -1) {
-	ErrorF("I/O lseek failed\n");
-	val = -1;
-	goto out;
-    }
-    if (read(fd, &val, 2) != 2) {
-	ErrorF("I/O read failed\n");
-	val = -1;
-	goto out;
-    }
- out:
-    return val;
-}
-
-unsigned int inl(unsigned long port)
-{
-    int fd = ia64_port_to_fd(port);
-    unsigned int val;
-
-    if (!fd)
-	return _inl(port & 0xffff);
-
-    if (lseek(fd, port & 0xffff, SEEK_SET) == -1) {
-	ErrorF("I/O lseek failed\n");
-	val = -1;
-	goto out;
-    }
-    if (read(fd, &val, 4) != 4) {
-	ErrorF("I/O read failed\n");
-	val = -1;
-	goto out;
-    }
- out:
-    return val;
-}
-
diff --git a/xorg-server/hw/xfree86/os-support/shared/vidmem.c b/xorg-server/hw/xfree86/os-support/shared/vidmem.c
index 6358138d8..54f6c6497 100644
--- a/xorg-server/hw/xfree86/os-support/shared/vidmem.c
+++ b/xorg-server/hw/xfree86/os-support/shared/vidmem.c
@@ -1,296 +1,290 @@
-/*

- * Copyright (c) 1993-2003 by The XFree86 Project, Inc.

- *

- * Permission is hereby granted, free of charge, to any person obtaining a

- * copy of this software and associated documentation files (the "Software"),

- * to deal in the Software without restriction, including without limitation

- * the rights to use, copy, modify, merge, publish, distribute, sublicense,

- * and/or sell copies of the Software, and to permit persons to whom the

- * Software is furnished to do so, subject to the following conditions:

- *

- * The above copyright notice and this permission notice shall be included in

- * all copies or substantial portions of the Software.

- *

- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

- * OTHER DEALINGS IN THE SOFTWARE.

- *

- * Except as contained in this notice, the name of the copyright holder(s)

- * and author(s) shall not be used in advertising or otherwise to promote

- * the sale, use or other dealings in this Software without prior written

- * authorization from the copyright holder(s) and author(s).

- */

-

-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include <X11/X.h>

-#include "input.h"

-#include "scrnintstr.h"

-

-#include "xf86.h"

-#include "xf86Priv.h"

-#include "xf86_OSlib.h"

-#include "xf86OSpriv.h"

-

-/*

- * This file contains the common part of the video memory mapping functions

- */

-

-/*

- * Get a piece of the ScrnInfoRec.  At the moment, this is only used to hold

- * the MTRR option information, but it is likely to be expanded if we do

- * auto unmapping of memory at VT switch.

- *

- */

-

-typedef struct {

-	unsigned long 	physBase;

-	unsigned long 	size;

-	pointer		virtBase;

-	pointer 	mtrrInfo;

-	int		flags;

-} MappingRec, *MappingPtr;

-	

-typedef struct {

-	int		numMappings;

-	MappingPtr *	mappings;

-	Bool		mtrrEnabled;

-	MessageType	mtrrFrom;

-	Bool		mtrrOptChecked;

-	ScrnInfoPtr	pScrn;

-} VidMapRec, *VidMapPtr;

-

-static int vidMapIndex = -1;

-

-#define VIDMAPPTR(p) ((VidMapPtr)((p)->privates[vidMapIndex].ptr))

-

-static VidMemInfo vidMemInfo = {FALSE, };

-static VidMapRec  vidMapRec  = {0, NULL, TRUE, X_DEFAULT, FALSE, NULL};

-

-static VidMapPtr

-getVidMapRec(int scrnIndex)

-{

-	VidMapPtr vp;

-	ScrnInfoPtr pScrn;

-

-	if ((scrnIndex < 0) ||

-	    !(pScrn = xf86Screens[scrnIndex]))

-		return &vidMapRec;

-

-	if (vidMapIndex < 0)

-		vidMapIndex = xf86AllocateScrnInfoPrivateIndex();

-

-	if (VIDMAPPTR(pScrn) != NULL)

-		return VIDMAPPTR(pScrn);

-

-	vp = pScrn->privates[vidMapIndex].ptr = xnfcalloc(sizeof(VidMapRec), 1);

-	vp->mtrrEnabled = TRUE;	/* default to enabled */

-	vp->mtrrFrom = X_DEFAULT;

-	vp->mtrrOptChecked = FALSE;

-	vp->pScrn = pScrn;

-	return vp;

-}

-

-static MappingPtr

-newMapping(VidMapPtr vp)

-{

-	vp->mappings = xnfrealloc(vp->mappings, sizeof(MappingPtr) *

-				  (vp->numMappings + 1));

-	vp->mappings[vp->numMappings] = xnfcalloc(sizeof(MappingRec), 1);

-	return vp->mappings[vp->numMappings++];

-}

-

-static MappingPtr

-findMapping(VidMapPtr vp, pointer vbase, unsigned long size)

-{

-	int i;

-

-	for (i = 0; i < vp->numMappings; i++) {

-		if (vp->mappings[i]->virtBase == vbase &&

-		    vp->mappings[i]->size == size)

-			return vp->mappings[i];

-	}

-	return NULL;

-}

-

-static void

-removeMapping(VidMapPtr vp, MappingPtr mp)

-{

-	int i, found = 0;

-

-	for (i = 0; i < vp->numMappings; i++) {

-		if (vp->mappings[i] == mp) {

-			found = 1;

-			free(vp->mappings[i]);

-		} else if (found) {

-			vp->mappings[i - 1] = vp->mappings[i];

-		}

-	}

-	vp->numMappings--;

-	vp->mappings[vp->numMappings] = NULL;

-}

-

-enum { OPTION_MTRR };

-static const OptionInfoRec opts[] =

-{

-	{ OPTION_MTRR, "mtrr", OPTV_BOOLEAN, {0}, FALSE },

-	{ -1, NULL, OPTV_NONE, {0}, FALSE }

-};

-

-static void

-checkMtrrOption(VidMapPtr vp)

-{

-	if (!vp->mtrrOptChecked && vp->pScrn && vp->pScrn->options != NULL) {

-		OptionInfoPtr options;

-

-		options = xnfalloc(sizeof(opts));

-		(void)memcpy(options, opts, sizeof(opts));

-		xf86ProcessOptions(vp->pScrn->scrnIndex, vp->pScrn->options,

-					options);

-		if (xf86GetOptValBool(options, OPTION_MTRR, &vp->mtrrEnabled))

-			vp->mtrrFrom = X_CONFIG;

-		free(options);

-		vp->mtrrOptChecked = TRUE;

-	}

-}

-

-void

-xf86MakeNewMapping(int ScreenNum, int Flags, unsigned long Base, unsigned long Size, pointer Vbase)

-{

-	VidMapPtr vp;

-	MappingPtr mp;

-

-	vp = getVidMapRec(ScreenNum);

-	mp = newMapping(vp);

-	mp->physBase = Base;

-	mp->size = Size;

-	mp->virtBase = Vbase;

-	mp->flags = Flags;

-}

-

-void

-xf86InitVidMem(void)

-{

-	if (!vidMemInfo.initialised) {

-		memset(&vidMemInfo, 0, sizeof(VidMemInfo));

-		xf86OSInitVidMem(&vidMemInfo);

-	}

-}

-

-pointer

-xf86MapVidMem(int ScreenNum, int Flags, unsigned long Base, unsigned long Size)

-{

-	pointer vbase = NULL;

-	VidMapPtr vp;

-	MappingPtr mp;

-

-	if (((Flags & VIDMEM_FRAMEBUFFER) &&

-	     (Flags & (VIDMEM_MMIO | VIDMEM_MMIO_32BIT))))

-	    FatalError("Mapping memory with more than one type\n");

-	    

-	xf86InitVidMem();

-	if (!vidMemInfo.initialised || !vidMemInfo.mapMem)

-		return NULL;

-

-	vbase = vidMemInfo.mapMem(ScreenNum, Base, Size, Flags);

-

-	if (!vbase || vbase == (pointer)-1)

-		return NULL;

-

-	vp = getVidMapRec(ScreenNum);

-	mp = newMapping(vp);

-	mp->physBase = Base;

-	mp->size = Size;

-	mp->virtBase = vbase;

-	mp->flags = Flags;

-

-	/*

-	 * Check the "mtrr" option even when MTRR isn't supported to avoid

-	 * warnings about unrecognised options.

-	 */

-	checkMtrrOption(vp);

-

-	if (vp->mtrrEnabled && vidMemInfo.setWC) {

-		if (Flags & (VIDMEM_MMIO | VIDMEM_MMIO_32BIT))

-			mp->mtrrInfo =

-				vidMemInfo.setWC(ScreenNum, Base, Size, FALSE,

-						 vp->mtrrFrom);

-		else if (Flags & VIDMEM_FRAMEBUFFER)

-			mp->mtrrInfo =

-				vidMemInfo.setWC(ScreenNum, Base, Size, TRUE,

-						 vp->mtrrFrom);

-	}

-	return vbase;

-}

-

-void

-xf86UnMapVidMem(int ScreenNum, pointer Base, unsigned long Size)

-{

-	VidMapPtr vp;

-	MappingPtr mp;

-

-	if (!vidMemInfo.initialised || !vidMemInfo.unmapMem) {

-		xf86DrvMsg(ScreenNum, X_WARNING,

-		  "xf86UnMapVidMem() called before xf86MapVidMem()\n");

-		return;

-	}

-

-	vp = getVidMapRec(ScreenNum);

-	mp = findMapping(vp, Base, Size);

-	if (!mp) {

-		xf86DrvMsg(ScreenNum, X_WARNING,

-		  "xf86UnMapVidMem: cannot find region for [%p,0x%lx]\n",

-		  Base, Size);

-		return;

-	}

-	if (vp->mtrrEnabled && vidMemInfo.undoWC && mp)

-		vidMemInfo.undoWC(ScreenNum, mp->mtrrInfo);

-

-	vidMemInfo.unmapMem(ScreenNum, Base, Size);

-	removeMapping(vp, mp);

-}

-

-Bool

-xf86CheckMTRR(int ScreenNum)

-{

-	VidMapPtr vp = getVidMapRec(ScreenNum);

-

-	/*

-	 * Check the "mtrr" option even when MTRR isn't supported to avoid

-	 * warnings about unrecognised options.

-	 */

-	checkMtrrOption(vp);

-

-	if (vp->mtrrEnabled && vidMemInfo.setWC)

-		return TRUE;

-		

-	return FALSE;

-}

-

-Bool

-xf86LinearVidMem(void)

-{

-	xf86InitVidMem();

-	return vidMemInfo.linearSupported;

-}

-

-void

-xf86MapReadSideEffects(int ScreenNum, int Flags, pointer base,

-			unsigned long Size)

-{

-	if (!(Flags & VIDMEM_READSIDEEFFECT))

-		return;

-

-	if (!vidMemInfo.initialised || !vidMemInfo.readSideEffects)

-		return;

-

-	vidMemInfo.readSideEffects(ScreenNum, base, Size);

-}

-

+/*
+ * Copyright (c) 1993-2003 by The XFree86 Project, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name of the copyright holder(s)
+ * and author(s) shall not be used in advertising or otherwise to promote
+ * the sale, use or other dealings in this Software without prior written
+ * authorization from the copyright holder(s) and author(s).
+ */
+
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include <X11/X.h>
+#include "input.h"
+#include "scrnintstr.h"
+
+#include "xf86.h"
+#include "xf86Priv.h"
+#include "xf86_OSlib.h"
+#include "xf86OSpriv.h"
+
+/*
+ * This file contains the common part of the video memory mapping functions
+ */
+
+/*
+ * Get a piece of the ScrnInfoRec.  At the moment, this is only used to hold
+ * the MTRR option information, but it is likely to be expanded if we do
+ * auto unmapping of memory at VT switch.
+ *
+ */
+
+typedef struct {
+	unsigned long 	size;
+	pointer		virtBase;
+	pointer 	mtrrInfo;
+} MappingRec, *MappingPtr;
+	
+typedef struct {
+	int		numMappings;
+	MappingPtr *	mappings;
+	Bool		mtrrEnabled;
+	MessageType	mtrrFrom;
+	Bool		mtrrOptChecked;
+	ScrnInfoPtr	pScrn;
+} VidMapRec, *VidMapPtr;
+
+static int vidMapIndex = -1;
+
+#define VIDMAPPTR(p) ((VidMapPtr)((p)->privates[vidMapIndex].ptr))
+
+static VidMemInfo vidMemInfo = {FALSE, };
+static VidMapRec  vidMapRec  = {0, NULL, TRUE, X_DEFAULT, FALSE, NULL};
+
+static VidMapPtr
+getVidMapRec(int scrnIndex)
+{
+	VidMapPtr vp;
+	ScrnInfoPtr pScrn;
+
+	if ((scrnIndex < 0) ||
+	    !(pScrn = xf86Screens[scrnIndex]))
+		return &vidMapRec;
+
+	if (vidMapIndex < 0)
+		vidMapIndex = xf86AllocateScrnInfoPrivateIndex();
+
+	if (VIDMAPPTR(pScrn) != NULL)
+		return VIDMAPPTR(pScrn);
+
+	vp = pScrn->privates[vidMapIndex].ptr = xnfcalloc(sizeof(VidMapRec), 1);
+	vp->mtrrEnabled = TRUE;	/* default to enabled */
+	vp->mtrrFrom = X_DEFAULT;
+	vp->mtrrOptChecked = FALSE;
+	vp->pScrn = pScrn;
+	return vp;
+}
+
+static MappingPtr
+newMapping(VidMapPtr vp)
+{
+	vp->mappings = xnfrealloc(vp->mappings, sizeof(MappingPtr) *
+				  (vp->numMappings + 1));
+	vp->mappings[vp->numMappings] = xnfcalloc(sizeof(MappingRec), 1);
+	return vp->mappings[vp->numMappings++];
+}
+
+static MappingPtr
+findMapping(VidMapPtr vp, pointer vbase, unsigned long size)
+{
+	int i;
+
+	for (i = 0; i < vp->numMappings; i++) {
+		if (vp->mappings[i]->virtBase == vbase &&
+		    vp->mappings[i]->size == size)
+			return vp->mappings[i];
+	}
+	return NULL;
+}
+
+static void
+removeMapping(VidMapPtr vp, MappingPtr mp)
+{
+	int i, found = 0;
+
+	for (i = 0; i < vp->numMappings; i++) {
+		if (vp->mappings[i] == mp) {
+			found = 1;
+			free(vp->mappings[i]);
+		} else if (found) {
+			vp->mappings[i - 1] = vp->mappings[i];
+		}
+	}
+	vp->numMappings--;
+	vp->mappings[vp->numMappings] = NULL;
+}
+
+enum { OPTION_MTRR };
+static const OptionInfoRec opts[] =
+{
+	{ OPTION_MTRR, "mtrr", OPTV_BOOLEAN, {0}, FALSE },
+	{ -1, NULL, OPTV_NONE, {0}, FALSE }
+};
+
+static void
+checkMtrrOption(VidMapPtr vp)
+{
+	if (!vp->mtrrOptChecked && vp->pScrn && vp->pScrn->options != NULL) {
+		OptionInfoPtr options;
+
+		options = xnfalloc(sizeof(opts));
+		(void)memcpy(options, opts, sizeof(opts));
+		xf86ProcessOptions(vp->pScrn->scrnIndex, vp->pScrn->options,
+					options);
+		if (xf86GetOptValBool(options, OPTION_MTRR, &vp->mtrrEnabled))
+			vp->mtrrFrom = X_CONFIG;
+		free(options);
+		vp->mtrrOptChecked = TRUE;
+	}
+}
+
+void
+xf86MakeNewMapping(int ScreenNum, int Flags, unsigned long Base, unsigned long Size, pointer Vbase)
+{
+	VidMapPtr vp;
+	MappingPtr mp;
+
+	vp = getVidMapRec(ScreenNum);
+	mp = newMapping(vp);
+	mp->size = Size;
+	mp->virtBase = Vbase;
+}
+
+void
+xf86InitVidMem(void)
+{
+	if (!vidMemInfo.initialised) {
+		memset(&vidMemInfo, 0, sizeof(VidMemInfo));
+		xf86OSInitVidMem(&vidMemInfo);
+	}
+}
+
+pointer
+xf86MapVidMem(int ScreenNum, int Flags, unsigned long Base, unsigned long Size)
+{
+	pointer vbase = NULL;
+	VidMapPtr vp;
+	MappingPtr mp;
+
+	if (((Flags & VIDMEM_FRAMEBUFFER) &&
+	     (Flags & (VIDMEM_MMIO | VIDMEM_MMIO_32BIT))))
+	    FatalError("Mapping memory with more than one type\n");
+	    
+	xf86InitVidMem();
+	if (!vidMemInfo.initialised || !vidMemInfo.mapMem)
+		return NULL;
+
+	vbase = vidMemInfo.mapMem(ScreenNum, Base, Size, Flags);
+
+	if (!vbase || vbase == (pointer)-1)
+		return NULL;
+
+	vp = getVidMapRec(ScreenNum);
+	mp = newMapping(vp);
+	mp->size = Size;
+	mp->virtBase = vbase;
+
+	/*
+	 * Check the "mtrr" option even when MTRR isn't supported to avoid
+	 * warnings about unrecognised options.
+	 */
+	checkMtrrOption(vp);
+
+	if (vp->mtrrEnabled && vidMemInfo.setWC) {
+		if (Flags & (VIDMEM_MMIO | VIDMEM_MMIO_32BIT))
+			mp->mtrrInfo =
+				vidMemInfo.setWC(ScreenNum, Base, Size, FALSE,
+						 vp->mtrrFrom);
+		else if (Flags & VIDMEM_FRAMEBUFFER)
+			mp->mtrrInfo =
+				vidMemInfo.setWC(ScreenNum, Base, Size, TRUE,
+						 vp->mtrrFrom);
+	}
+	return vbase;
+}
+
+void
+xf86UnMapVidMem(int ScreenNum, pointer Base, unsigned long Size)
+{
+	VidMapPtr vp;
+	MappingPtr mp;
+
+	if (!vidMemInfo.initialised || !vidMemInfo.unmapMem) {
+		xf86DrvMsg(ScreenNum, X_WARNING,
+		  "xf86UnMapVidMem() called before xf86MapVidMem()\n");
+		return;
+	}
+
+	vp = getVidMapRec(ScreenNum);
+	mp = findMapping(vp, Base, Size);
+	if (!mp) {
+		xf86DrvMsg(ScreenNum, X_WARNING,
+		  "xf86UnMapVidMem: cannot find region for [%p,0x%lx]\n",
+		  Base, Size);
+		return;
+	}
+	if (vp->mtrrEnabled && vidMemInfo.undoWC && mp)
+		vidMemInfo.undoWC(ScreenNum, mp->mtrrInfo);
+
+	vidMemInfo.unmapMem(ScreenNum, Base, Size);
+	removeMapping(vp, mp);
+}
+
+Bool
+xf86CheckMTRR(int ScreenNum)
+{
+	VidMapPtr vp = getVidMapRec(ScreenNum);
+
+	/*
+	 * Check the "mtrr" option even when MTRR isn't supported to avoid
+	 * warnings about unrecognised options.
+	 */
+	checkMtrrOption(vp);
+
+	if (vp->mtrrEnabled && vidMemInfo.setWC)
+		return TRUE;
+		
+	return FALSE;
+}
+
+Bool
+xf86LinearVidMem(void)
+{
+	xf86InitVidMem();
+	return vidMemInfo.linearSupported;
+}
+
+void
+xf86MapReadSideEffects(int ScreenNum, int Flags, pointer base,
+			unsigned long Size)
+{
+	if (!(Flags & VIDMEM_READSIDEEFFECT))
+		return;
+
+	if (!vidMemInfo.initialised || !vidMemInfo.readSideEffects)
+		return;
+
+	vidMemInfo.readSideEffects(ScreenNum, base, Size);
+}
+