xserver pixman mesa git update 4 nov 2011

9 files changed, 1037 insertions, 1117 deletions

diff --git a/xorg-server/hw/xfree86/os-support/bsd/alpha_video.c b/xorg-server/hw/xfree86/os-support/bsd/alpha_video.c
index 15eb2a422..882fb3b46 100644
--- a/xorg-server/hw/xfree86/os-support/bsd/alpha_video.c
+++ b/xorg-server/hw/xfree86/os-support/bsd/alpha_video.c
@@ -33,12 +33,10 @@
 
 #include <sys/param.h>
 #ifndef __NetBSD__
-#  include <sys/sysctl.h>
-#  if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-#      include <machine/sysarch.h>
-#   endif
-# else
-#  include <machine/sysarch.h>
+#include <sys/sysctl.h>
+#endif
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
+#include <machine/sysarch.h>
 #endif
 
 #include "xf86Axp.h"
@@ -52,10 +50,6 @@
 #define MAP_FLAGS (MAP_FILE | MAP_SHARED)
 #endif
 
-#ifndef MAP_FAILED
-#define MAP_FAILED ((caddr_t)-1)
-#endif
-
 axpDevice bsdGetAXP(void);
 
 #ifndef __NetBSD__
@@ -64,8 +58,6 @@ extern unsigned long dense_base(void);
 static int axpSystem = -1;
 static unsigned long hae_thresh;
 static unsigned long hae_mask;
-static unsigned long bus_base;
-static unsigned long sparse_size;
 
 static unsigned long
 memory_base(void)
@@ -197,7 +189,6 @@ static int  devMemFd = -1;
 #ifdef HAS_APERTURE_DRV
 #define DEV_APERTURE "/dev/xf86"
 #endif
-#define DEV_MEM "/dev/mem"
 
 static pointer mapVidMem(int, unsigned long, unsigned long, int);
 static void unmapVidMem(int, pointer, unsigned long);
@@ -297,7 +288,6 @@ xf86OSInitVidMem(VidMemInfoPtr pVidMem)
                 axpSystem = bsdGetAXP(); 
 	    hae_thresh = xf86AXPParams[axpSystem].hae_thresh;
             hae_mask = xf86AXPParams[axpSystem].hae_mask;
-            sparse_size = xf86AXPParams[axpSystem].size;
 #endif /* __NetBSD__ */
 	}
 	pVidMem->initialised = TRUE;
@@ -440,7 +430,6 @@ xf86DisableIO()
 
 #define vuip    volatile unsigned int *
 
-static unsigned long msb_set = 0;
 static pointer memSBase = 0;
 static pointer memBase = 0;
 
@@ -478,29 +467,25 @@ writeSparse32(int Value, pointer Base, register unsigned long Offset);
 
 #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 extern int sysarch(int, void *);
-#endif
 
 struct parms {
 	u_int64_t hae;
 };
 
-#ifndef __NetBSD__
-static int
+static void
 sethae(u_int64_t hae)
 {
-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 #ifndef ALPHA_SETHAE
 #define ALPHA_SETHAE 0
 #endif
-	struct parms p;
-	p.hae = hae;
-	return (sysarch(ALPHA_SETHAE, (char *)&p));
-#endif
-#ifdef __OpenBSD__
-	return -1;
-#endif
+	static struct parms p;
+
+	if (p.hae != hae) {
+		p.hae = hae;
+		sysarch(ALPHA_SETHAE, (char *)&p);
+	}
 }
-#endif /* __NetBSD__ */
+#endif
 
 static pointer
 mapVidMemSparse(int ScreenNum, unsigned long Base, unsigned long Size, int flags)
@@ -555,12 +540,9 @@ readSparse8(pointer Base, register unsigned long Offset)
       if (Offset >= (hae_thresh)) {
         msb = Offset & hae_mask;
         Offset -= msb;
-	if (msb_set != msb) {
-#ifndef __NetBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 	sethae(msb);
 #endif
-	msb_set = msb;
-	}
       }
     result = *(vuip) ((unsigned long)memSBase + (Offset << 5));
     result >>= shift;
@@ -579,12 +561,9 @@ readSparse16(pointer Base, register unsigned long Offset)
     if (Offset >= (hae_thresh)) {
         msb = Offset & hae_mask;
         Offset -= msb;
-      if (msb_set != msb) {
-#ifndef __NetBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 	sethae(msb);
 #endif
-	msb_set = msb;
-      }
     }
     result = *(vuip)((unsigned long)memSBase+(Offset<<5)+(1<<(5-2)));
     result >>= shift;
@@ -609,12 +588,9 @@ writeSparse8(int Value, pointer Base, register unsigned long Offset)
     if (Offset >= (hae_thresh)) {
       msb = Offset & hae_mask;
       Offset -= msb;
-      if (msb_set != msb) {
-#ifndef __NetBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 	sethae(msb);
 #endif
-	msb_set = msb;
-      }
     }
     *(vuip) ((unsigned long)memSBase + (Offset << 5)) = b * 0x01010101;
 }
@@ -630,12 +606,9 @@ writeSparse16(int Value, pointer Base, register unsigned long Offset)
     if (Offset >= (hae_thresh)) {
       msb = Offset & hae_mask;
       Offset -= msb;
-      if (msb_set != msb) {
-#ifndef __NetBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 	sethae(msb);
 #endif
-	msb_set = msb;
-      }
     }
     *(vuip)((unsigned long)memSBase+(Offset<<5)+(1<<(5-2))) =
       w * 0x00010001;
@@ -660,12 +633,9 @@ writeSparseNB8(int Value, pointer Base, register unsigned long Offset)
     if (Offset >= (hae_thresh)) {
       msb = Offset & hae_mask;
       Offset -= msb;
-      if (msb_set != msb) {
-#ifndef __NetBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 	sethae(msb);
 #endif
-	msb_set = msb;
-      }
     }
     *(vuip) ((unsigned long)memSBase + (Offset << 5)) = b * 0x01010101;
 }
@@ -680,12 +650,9 @@ writeSparseNB16(int Value, pointer Base, register unsigned long Offset)
     if (Offset >= (hae_thresh)) {
       msb = Offset & hae_mask ;
       Offset -= msb;
-      if (msb_set != msb) {
-#ifndef __NetBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 	sethae(msb);
 #endif
-	msb_set = msb;
-      }
     }
     *(vuip)((unsigned long)memSBase+(Offset<<5)+(1<<(5-2))) =
       w * 0x00010001;
diff --git a/xorg-server/hw/xfree86/os-support/bsd/arm_video.c b/xorg-server/hw/xfree86/os-support/bsd/arm_video.c
index eb631a7f3..1de6c87d6 100644
--- a/xorg-server/hw/xfree86/os-support/bsd/arm_video.c
+++ b/xorg-server/hw/xfree86/os-support/bsd/arm_video.c
@@ -97,11 +97,6 @@ struct memAccess ioMemInfo = { CONSOLE_GET_IO_INFO, NULL, NULL,
 #define MAP_FLAGS (MAP_FILE | MAP_SHARED)
 #endif
 
-#ifndef MAP_FAILED
-#define MAP_FAILED ((caddr_t)-1)
-#endif
-
-
 #define BUS_BASE	0L
 #define BUS_BASE_BWX	0L
 
@@ -113,8 +108,6 @@ struct memAccess ioMemInfo = { CONSOLE_GET_IO_INFO, NULL, NULL,
 static Bool useDevMem = FALSE;
 static int  devMemFd = -1;
 
-#define DEV_MEM "/dev/mem"
-
 static pointer mapVidMem(int, unsigned long, unsigned long, int);
 static void unmapVidMem(int, pointer, unsigned long);
 
diff --git a/xorg-server/hw/xfree86/os-support/bsd/bsd_init.c b/xorg-server/hw/xfree86/os-support/bsd/bsd_init.c
index 844617980..b58d6a790 100644
--- a/xorg-server/hw/xfree86/os-support/bsd/bsd_init.c
+++ b/xorg-server/hw/xfree86/os-support/bsd/bsd_init.c
@@ -710,7 +710,6 @@ xf86UseMsg()
 {
 #if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT)
 	ErrorF("vtXX                   use the specified VT number (1-12)\n");
-	ErrorF("-sharevts              share VTs with another X server\n");
 #endif /* SYSCONS_SUPPORT || PCVT_SUPPORT */
 	ErrorF("-keeptty               ");
 	ErrorF("don't detach controlling tty (for debugging only)\n");
diff --git a/xorg-server/hw/xfree86/os-support/bsd/i386_video.c b/xorg-server/hw/xfree86/os-support/bsd/i386_video.c
index 20dbde86a..35e00fce7 100644
--- a/xorg-server/hw/xfree86/os-support/bsd/i386_video.c
+++ b/xorg-server/hw/xfree86/os-support/bsd/i386_video.c
@@ -64,10 +64,6 @@
 #define MAP_FLAGS (MAP_FILE | MAP_SHARED)
 #endif
 
-#ifndef MAP_FAILED
-#define MAP_FAILED ((caddr_t)-1)
-#endif
-
 #ifdef __OpenBSD__
 #define SYSCTL_MSG "\tCheck that you have set 'machdep.allowaperture=1'\n"\
 		   "\tin /etc/sysctl.conf and reboot your machine\n" \
@@ -88,7 +84,6 @@ static int  devMemFd = -1;
 #ifdef HAS_APERTURE_DRV
 #define DEV_APERTURE "/dev/xf86"
 #endif
-#define DEV_MEM "/dev/mem"
 
 static pointer mapVidMem(int, unsigned long, unsigned long, int);
 static void unmapVidMem(int, pointer, unsigned long);
diff --git a/xorg-server/hw/xfree86/os-support/bsd/ppc_video.c b/xorg-server/hw/xfree86/os-support/bsd/ppc_video.c
index aeaf18305..e5d832eed 100644
--- a/xorg-server/hw/xfree86/os-support/bsd/ppc_video.c
+++ b/xorg-server/hw/xfree86/os-support/bsd/ppc_video.c
@@ -36,18 +36,11 @@
 
 #include "bus/Pci.h"
 
-#ifndef MAP_FAILED
-#define MAP_FAILED ((caddr_t)-1)
-#endif
-
-
 /***************************************************************************/
 /* Video Memory Mapping section                                            */
 /***************************************************************************/
 
-#ifndef __OpenBSD__
-#define DEV_MEM "/dev/mem"
-#else
+#ifdef __OpenBSD__
 #define DEV_MEM "/dev/xf86"
 #endif
 
diff --git a/xorg-server/hw/xfree86/os-support/bsd/sparc64_video.c b/xorg-server/hw/xfree86/os-support/bsd/sparc64_video.c
index a2a30c9d7..960c850a8 100644
--- a/xorg-server/hw/xfree86/os-support/bsd/sparc64_video.c
+++ b/xorg-server/hw/xfree86/os-support/bsd/sparc64_video.c
@@ -34,10 +34,6 @@
 #include "xf86_OSlib.h"
 #include "xf86OSpriv.h"
 
-#ifndef MAP_FAILED
-#define MAP_FAILED ((caddr_t)-1)
-#endif
-
 /***************************************************************************/
 /* Video Memory Mapping section                                            */
 /***************************************************************************/
diff --git a/xorg-server/hw/xfree86/os-support/linux/lnx_video.c b/xorg-server/hw/xfree86/os-support/linux/lnx_video.c
index 697c9fe30..e711784e7 100644
--- a/xorg-server/hw/xfree86/os-support/linux/lnx_video.c
+++ b/xorg-server/hw/xfree86/os-support/linux/lnx_video.c
@@ -1,881 +1,877 @@
-/*

- * Copyright 1992 by Orest Zborowski <obz@Kodak.com>

- * 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 names of Orest Zborowski and David Wexelblat

- * not be used in advertising or publicity pertaining to distribution of

- * the software without specific, written prior permission.  Orest Zborowski

- * and David Wexelblat make no representations about the suitability of this

- * software for any purpose.  It is provided "as is" without express or

- * implied warranty.

- *

- * OREST ZBOROWSKI AND DAVID WEXELBLAT DISCLAIMS ALL WARRANTIES WITH REGARD

- * TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND

- * FITNESS, IN NO EVENT SHALL OREST ZBOROWSKI OR 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 <errno.h>

-#include <string.h>

-

-#include <X11/X.h>

-#include "input.h"

-#include "scrnintstr.h"

-

-#include "xf86.h"

-#include "xf86Priv.h"

-#include "xf86_OSlib.h"

-#include "xf86OSpriv.h"

-#ifdef __alpha__

-#include "shared/xf86Axp.h"

-#endif

-

-#ifdef HAS_MTRR_SUPPORT

-#include <asm/mtrr.h>

-#endif

-

-#ifndef MAP_FAILED

-#define MAP_FAILED ((void *)-1)

-#endif

-

-static Bool ExtendedEnabled = FALSE;

-

-#ifdef __ia64__

-

-#include "compiler.h"

-#include <sys/io.h>

-

-#elif !defined(__powerpc__) && \

-      !defined(__mc68000__) && \

-      !defined(__sparc__) && \

-      !defined(__mips__) && \

-      !defined(__nds32__) && \

-      !defined(__arm__)

-

-/*

- * Due to conflicts with "compiler.h", don't rely on <sys/io.h> to declare

- * these.

- */

-extern int ioperm(unsigned long __from, unsigned long __num, int __turn_on);

-extern int iopl(int __level);

-

-#endif

-

-#ifdef __alpha__

-# define BUS_BASE bus_base

-#else 

-#define BUS_BASE (0)

-#endif /*  __alpha__ */

-

-/***************************************************************************/

-/* Video Memory Mapping section                                            */

-/***************************************************************************/

-

-static pointer mapVidMem(int, unsigned long, unsigned long, int);

-static void unmapVidMem(int, pointer, unsigned long);

-#if defined (__alpha__) 

-extern void sethae(unsigned long hae);

-extern unsigned long _bus_base __P ((void)) __attribute__ ((const));

-extern unsigned long _bus_base_sparse __P ((void)) __attribute__ ((const));

-

-static pointer mapVidMemSparse(int, unsigned long, unsigned long, int);

-extern axpDevice lnxGetAXP(void);

-static void unmapVidMemSparse(int, pointer, unsigned long);

-static axpDevice axpSystem = -1;

-static Bool needSparse;

-static unsigned long hae_thresh;

-static unsigned long hae_mask;

-static unsigned long bus_base;

-#endif

-

-#ifdef HAS_MTRR_SUPPORT

-

-#define SPLIT_WC_REGIONS 1

-

-static pointer setWC(int, unsigned long, unsigned long, Bool, MessageType);

-static void undoWC(int, pointer);

-

-/* The file desc for /proc/mtrr. Once opened, left opened, and the mtrr

-   driver will clean up when we exit. */

-#define MTRR_FD_UNOPENED (-1)	/* We have yet to open /proc/mtrr */

-#define MTRR_FD_PROBLEM (-2)	/* We tried to open /proc/mtrr, but had

-				   a problem. */

-static int mtrr_fd = MTRR_FD_UNOPENED;

-

-/* Open /proc/mtrr. FALSE on failure. Will always fail on Linux 2.0, 

-   and will fail on Linux 2.2 with MTRR support configured out,

-   so verbosity should be chosen appropriately. */

-static Bool

-mtrr_open(int verbosity)

-{

-	/* Only report absence of /proc/mtrr once. */

-	static Bool warned = FALSE;

-

-	if (mtrr_fd == MTRR_FD_UNOPENED) { 

-		mtrr_fd = open("/proc/mtrr", O_WRONLY);

-

-		if (mtrr_fd < 0)

-			mtrr_fd = MTRR_FD_PROBLEM;

-	}

-

-	if (mtrr_fd == MTRR_FD_PROBLEM) {

-		/* To make sure we only ever warn once, need to check

-		   verbosity outside xf86MsgVerb */

-		if (!warned && verbosity <= xf86GetVerbosity()) {

-			xf86MsgVerb(X_WARNING, verbosity,

-				  "System lacks support for changing MTRRs\n");

-			warned = TRUE;

-		}

-

-		return FALSE;

-	}

-	else

-		return TRUE;

-}

-

-/*

- * We maintain a list of WC regions for each physical mapping so they can

- * be undone when unmapping.

- */

-

-struct mtrr_wc_region {

-	struct mtrr_sentry	sentry;

-	Bool			added;		/* added WC or removed it */

-	struct mtrr_wc_region *	next;

-};

-

-

-static struct mtrr_wc_region *

-mtrr_cull_wc_region(int screenNum, unsigned long base, unsigned long size,

-		      MessageType from)

-{

-	/* Some BIOS writers thought that setting wc over the mmio

-	   region of a graphics devices was a good idea. Try to fix

-	   it. */

-

-	struct mtrr_gentry gent;

-	struct mtrr_wc_region *wcreturn = NULL, *wcr;

-	int count, ret=0;

-

-	/* Linux 2.0 users should not get a warning without -verbose */

-	if (!mtrr_open(2))

-		return NULL;

-

-	for (gent.regnum = 0; 

-	     ioctl(mtrr_fd, MTRRIOC_GET_ENTRY, &gent) >= 0;

-	     gent.regnum++) {

-		if (gent.type != MTRR_TYPE_WRCOMB

-		    || gent.base + gent.size <= base

-		    || base + size <= gent.base)

-			continue;

-

-		/* Found an overlapping region. Delete it. */

-		

-		wcr = malloc(sizeof(*wcr));

-		if (!wcr)

-			return NULL;

-		wcr->sentry.base = gent.base;

-		wcr->sentry.size = gent.size;

-		wcr->sentry.type = MTRR_TYPE_WRCOMB;

-		wcr->added = FALSE;

-		

-		count = 3;

-		while (count-- && 

-		       (ret = ioctl(mtrr_fd, MTRRIOC_KILL_ENTRY, &(wcr->sentry))) < 0);

-		

-		if (ret >= 0) {

-			xf86DrvMsg(screenNum, from,

-				   "Removed MMIO write-combining range "

-				   "(0x%lx,0x%lx)\n",

-				   (unsigned long) gent.base, (unsigned long) gent.size);

-			wcr->next = wcreturn;

-			wcreturn = wcr;

-			gent.regnum--;

-		} else {

-			free(wcr);

-			xf86DrvMsgVerb(screenNum, X_WARNING, 0,

-				   "Failed to remove MMIO "

-				   "write-combining range (0x%lx,0x%lx)\n",

-				       gent.base, (unsigned long) gent.size);

-		}

-	}

-	return wcreturn;

-}

-

-

-static struct mtrr_wc_region *

-mtrr_remove_offending(int screenNum, unsigned long base, unsigned long size,

-		      MessageType from)

-{

-    struct mtrr_gentry gent;

-    struct mtrr_wc_region *wcreturn = NULL, **wcr;

-

-    if (!mtrr_open(2))

-	return NULL;

-

-    wcr = &wcreturn;

-    for (gent.regnum = 0; 

-	 ioctl(mtrr_fd, MTRRIOC_GET_ENTRY, &gent) >= 0; gent.regnum++ ) {

-	if (gent.type == MTRR_TYPE_WRCOMB

-	    && ((gent.base >= base && gent.base + gent.size < base + size) || 

-		(gent.base >  base && gent.base + gent.size <= base + size))) {

-	    *wcr = mtrr_cull_wc_region(screenNum, gent.base, gent.size, from);

-	    if (*wcr) gent.regnum--;

-	    while(*wcr) {

-		wcr = &((*wcr)->next);

-	    }

-	}

-    }

-    return wcreturn;

-}

-

-

-static struct mtrr_wc_region *

-mtrr_add_wc_region(int screenNum, unsigned long base, unsigned long size,

-		   MessageType from)

-{

-        struct mtrr_wc_region **wcr, *wcreturn, *curwcr;

-

-       /*

-        * There can be only one....

-        */

-

-	wcreturn = mtrr_remove_offending(screenNum, base, size, from);

-	wcr = &wcreturn;

-	while (*wcr) {

-	    wcr = &((*wcr)->next);

-	} 

-

-	/* Linux 2.0 should not warn, unless the user explicitly asks for

-	   WC. */

-

-	if (!mtrr_open(from == X_CONFIG ? 0 : 2))

-		return wcreturn;

-

-	*wcr = curwcr = malloc(sizeof(**wcr));

-	if (!curwcr)

-	    return wcreturn;

-

-	curwcr->sentry.base = base;

-	curwcr->sentry.size = size;

-	curwcr->sentry.type = MTRR_TYPE_WRCOMB;

-	curwcr->added = TRUE;

-	curwcr->next = NULL;

-

-#if SPLIT_WC_REGIONS

-	/*

-	 * Splits up the write-combining region if it is not aligned on a

- 	 * size boundary.

-	 */

-

-	{

-	    unsigned long lbase, d_size = 1;

-	    unsigned long n_size = size;

-	    unsigned long n_base = base;

-

-	    for (lbase = n_base, d_size = 1; !(lbase & 1);

-		 lbase = lbase >> 1, d_size <<= 1);

-	    while (d_size > n_size)

-		d_size = d_size >> 1;

-	    DebugF("WC_BASE: 0x%lx WC_END: 0x%lx\n",base,base+d_size-1);

-	    n_base += d_size;

-	    n_size -= d_size;

-	    if (n_size) {

-		xf86DrvMsgVerb(screenNum,X_INFO,3,"Splitting WC range: "

-			       "base: 0x%lx, size: 0x%lx\n",base,size);

-		curwcr->next = mtrr_add_wc_region(screenNum, n_base, n_size,from);

-	    }

-	    curwcr->sentry.size = d_size;

-	} 

-	

-	/*****************************************************************/

-#endif /* SPLIT_WC_REGIONS */

-

-	if (ioctl(mtrr_fd, MTRRIOC_ADD_ENTRY, &curwcr->sentry) >= 0) {

-		/* Avoid printing on every VT switch */

-		if (xf86ServerIsInitialising()) {

-			xf86DrvMsg(screenNum, from,

-				   "Write-combining range (0x%lx,0x%lx)\n",

-				   base, size);

-		}

-		return wcreturn;

-	}

-	else {

-	        *wcr = curwcr->next;

-		free(curwcr);

-		

-		/* Don't complain about the VGA region: MTRR fixed

-		   regions aren't currently supported, but might be in

-		   the future. */

-		if ((unsigned long)base >= 0x100000) {

-			xf86DrvMsgVerb(screenNum, X_WARNING, 0,

-				"Failed to set up write-combining range "

-				"(0x%lx,0x%lx)\n", base, size);

-		}

-		return wcreturn;

-	}

-}

-

-static void

-mtrr_undo_wc_region(int screenNum, struct mtrr_wc_region *wcr)

-{

-	struct mtrr_wc_region *p, *prev;

-

-	if (mtrr_fd >= 0) {

-		p = wcr;

-		while (p) {

-			if (p->added)

-				ioctl(mtrr_fd, MTRRIOC_DEL_ENTRY, &p->sentry);

-			prev = p;

-			p = p->next;

-			free(prev);

-		}

-	}

-}

-

-static pointer

-setWC(int screenNum, unsigned long base, unsigned long size, Bool enable,

-      MessageType from)

-{

-	if (enable)

-		return mtrr_add_wc_region(screenNum, base, size, from);

-	else

-		return mtrr_cull_wc_region(screenNum, base, size, from);

-}

-

-static void

-undoWC(int screenNum, pointer regioninfo)

-{

-	mtrr_undo_wc_region(screenNum, regioninfo);

-}

-

-#endif /* HAS_MTRR_SUPPORT */

-

-void

-xf86OSInitVidMem(VidMemInfoPtr pVidMem)

-{

-	pVidMem->linearSupported = TRUE;

-#ifdef __alpha__

-	if (axpSystem == -1) {

-	  axpSystem = lnxGetAXP();

-	  if ((needSparse = (_bus_base_sparse() > 0))) {

-	    hae_thresh = xf86AXPParams[axpSystem].hae_thresh;

-	    hae_mask = xf86AXPParams[axpSystem].hae_mask;

-	  }

-	  bus_base = _bus_base();

-	}

-	if (needSparse) {

-	  xf86Msg(X_INFO,"Machine needs sparse mapping\n");

-	  pVidMem->mapMem = mapVidMemSparse;

-	  pVidMem->unmapMem = unmapVidMemSparse;

-	} else {

-	  xf86Msg(X_INFO,"Machine type has 8/16 bit access\n");

-	  pVidMem->mapMem = mapVidMem;

-	  pVidMem->unmapMem = unmapVidMem;

-	}	

-#else

-	pVidMem->mapMem = mapVidMem;

-	pVidMem->unmapMem = unmapVidMem;

-#endif /* __alpha__ */

-

-

-#ifdef HAS_MTRR_SUPPORT

-	pVidMem->setWC = setWC;

-	pVidMem->undoWC = undoWC;

-#endif

-	pVidMem->initialised = TRUE;

-}

-

-#ifdef __sparc__

-/* Basically, you simply cannot do this on Sparc.  You have to do something portable

- * like use /dev/fb* or mmap() on /proc/bus/pci/X/Y nodes. -DaveM

- */

-static pointer mapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int flags)

-{

-	return NULL;

-}

-#else

-static pointer

-mapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int flags)

-{

-    pointer base;

-    int fd;

-    int mapflags = MAP_SHARED; 

-    int prot;

-    memType realBase, alignOff;

-

-    realBase = Base & ~(getpagesize() - 1);

-    alignOff = Base - realBase;

-    DebugF("base: %lx, realBase: %lx, alignOff: %lx \n",

-	   Base,realBase,alignOff);

-

-#if defined(__ia64__) || defined(__arm__) || defined(__s390__)

-#ifndef MAP_WRITECOMBINED

-#define MAP_WRITECOMBINED 0x00010000

-#endif

-#ifndef MAP_NONCACHED

-#define MAP_NONCACHED 0x00020000

-#endif

-    if(flags & VIDMEM_FRAMEBUFFER) 

-        mapflags |= MAP_WRITECOMBINED; 

-    else

-        mapflags |= MAP_NONCACHED; 

-#endif

-

-#if 0

-    /* this will disappear when people upgrade their kernels */

-    fd = open(DEV_MEM,

-	      ((flags & VIDMEM_READONLY) ? O_RDONLY : O_RDWR) | O_SYNC);

-#else

-    fd = open(DEV_MEM, (flags & VIDMEM_READONLY) ? O_RDONLY : O_RDWR);

-#endif

-    if (fd < 0)

-    {

-	FatalError("xf86MapVidMem: failed to open " DEV_MEM " (%s)\n",

-		   strerror(errno));

-    }

-

-    if (flags & VIDMEM_READONLY)

-	prot = PROT_READ;

-    else

-	prot = PROT_READ | PROT_WRITE;

-

-    /* This requires linux-0.99.pl10 or above */

-    base = mmap((caddr_t)0, Size + alignOff, prot, mapflags, fd,

- 		(off_t)realBase  + BUS_BASE);

-    close(fd);

-    if (base == MAP_FAILED) {

-        FatalError("xf86MapVidMem: Could not mmap framebuffer"

-		   " (0x%08lx,0x%lx) (%s)\n", Base, Size,

-		   strerror(errno));

-    }

-    DebugF("base: %lx aligned base: %lx\n",base, (char *)base + alignOff);

-    return (char *)base + alignOff;

-}

-#endif /* !(__sparc__) */

-    

-static void

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

-{

-    memType alignOff = (memType)Base 

-	- ((memType)Base & ~(getpagesize() - 1));

-

-    DebugF("alignment offset: %lx\n",alignOff);

-    munmap((caddr_t)((memType)Base - alignOff), (Size + alignOff));

-}

-

-

-/***************************************************************************/

-/* I/O Permissions section                                                 */

-/***************************************************************************/

-

-#if defined(__powerpc__)

-volatile unsigned char *ioBase = NULL;

-

-#ifndef __NR_pciconfig_iobase

-#define __NR_pciconfig_iobase	200

-#endif

-

-#endif

-

-Bool

-xf86EnableIO(void)

-{

-#if defined(__powerpc__)

-	int fd;

-	unsigned int ioBase_phys;

-#endif

-

-	if (ExtendedEnabled)

-		return TRUE;

-

-#if defined(__powerpc__)

-	ioBase_phys = syscall(__NR_pciconfig_iobase, 2, 0, 0);

-

-	fd = open("/dev/mem", O_RDWR);

-	if (ioBase == NULL) {

-		ioBase = (volatile unsigned char *)mmap(0, 0x20000,

-				PROT_READ | PROT_WRITE, MAP_SHARED, fd,

-				ioBase_phys);

-/* Should this be fatal or just a warning? */

-#if 0

-		if (ioBase == MAP_FAILED) {

-		    xf86Msg(X_WARNING,

-			    "xf86EnableIOPorts: Failed to map iobase (%s)\n",

-			    strerror(errno));

-		    return FALSE;

-		}

-#endif

-	}

-	close(fd);

-#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__) && !defined(__m32r__) && !defined(__nds32__)

-        if (ioperm(0, 1024, 1) || iopl(3)) {

-                if (errno == ENODEV)

-                        ErrorF("xf86EnableIOPorts: no I/O ports found\n");

-                else

-                        FatalError("xf86EnableIOPorts: failed to set IOPL"

-                                   " for I/O (%s)\n", strerror(errno));

-		return FALSE;

-        }

-# if !defined(__alpha__)

-	/* XXX: this is actually not trapping anything because of iopl(3)

-	 * above */

-	ioperm(0x40,4,0); /* trap access to the timer chip */

-	ioperm(0x60,4,0); /* trap access to the keyboard controller */

-# endif

-#endif

-	ExtendedEnabled = TRUE;

-

-	return TRUE;

-}

-

-void

-xf86DisableIO(void)

-{

-	if (!ExtendedEnabled)

-		return;

-#if defined(__powerpc__)

-	munmap(ioBase, 0x20000);

-	ioBase = NULL;

-#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__arm__) && !defined(__s390__) && !defined(__m32r__) && !defined(__nds32__)

-	iopl(0);

-	ioperm(0, 1024, 0);

-#endif

-	ExtendedEnabled = FALSE;

-

-	return;

-}

-

-#if defined (__alpha__)

-

-#define vuip    volatile unsigned int *

-

-extern int readDense8(pointer Base, register unsigned long Offset);

-extern int readDense16(pointer Base, register unsigned long Offset);

-extern int readDense32(pointer Base, register unsigned long Offset);

-extern void

-writeDenseNB8(int Value, pointer Base, register unsigned long Offset);

-extern void

-writeDenseNB16(int Value, pointer Base, register unsigned long Offset);

-extern void

-writeDenseNB32(int Value, pointer Base, register unsigned long Offset);

-extern void

-writeDense8(int Value, pointer Base, register unsigned long Offset);

-extern void

-writeDense16(int Value, pointer Base, register unsigned long Offset);

-extern void

-writeDense32(int Value, pointer Base, register unsigned long Offset);

-

-static int readSparse8(pointer Base, register unsigned long Offset);

-static int readSparse16(pointer Base, register unsigned long Offset);

-static int readSparse32(pointer Base, register unsigned long Offset);

-static void

-writeSparseNB8(int Value, pointer Base, register unsigned long Offset);

-static void

-writeSparseNB16(int Value, pointer Base, register unsigned long Offset);

-static void

-writeSparseNB32(int Value, pointer Base, register unsigned long Offset);

-static void

-writeSparse8(int Value, pointer Base, register unsigned long Offset);

-static void

-writeSparse16(int Value, pointer Base, register unsigned long Offset);

-static void

-writeSparse32(int Value, pointer Base, register unsigned long Offset);

-

-#define DENSE_BASE	0x2ff00000000UL

-#define SPARSE_BASE	0x30000000000UL

-

-static unsigned long msb_set = 0;

-

-static pointer

-mapVidMemSparse(int ScreenNum, unsigned long Base, unsigned long Size, int flags)

-{

-    int fd, prot;

-    unsigned long ret, rets = 0;

-

-    static Bool was_here = FALSE;

-

-    if (!was_here) {

-      was_here = TRUE;

-

-      xf86WriteMmio8 = writeSparse8;

-      xf86WriteMmio16 = writeSparse16;

-      xf86WriteMmio32 = writeSparse32;

-      xf86WriteMmioNB8 = writeSparseNB8;

-      xf86WriteMmioNB16 = writeSparseNB16;

-      xf86WriteMmioNB32 = writeSparseNB32;

-      xf86ReadMmio8 = readSparse8;

-      xf86ReadMmio16 = readSparse16;

-      xf86ReadMmio32 = readSparse32;

-    }

-	

-    fd = open(DEV_MEM, (flags & VIDMEM_READONLY) ? O_RDONLY : O_RDWR);

-    if (fd < 0) {

-        FatalError("xf86MapVidMem: failed to open " DEV_MEM " (%s)\n",

-		   strerror(errno));

-    }

-

-#if 0

-    xf86Msg(X_INFO,"mapVidMemSparse: try Base 0x%lx size 0x%lx flags 0x%x\n",

-	    Base, Size, flags);

-#endif

-

-    if (flags & VIDMEM_READONLY)

-	prot = PROT_READ;

-    else

-	prot = PROT_READ | PROT_WRITE;

-

-    /* This requirers linux-0.99.pl10 or above */

-

-    /*

-     * Always do DENSE mmap, since read32/write32 currently require it.

-     */

-    ret = (unsigned long)mmap((caddr_t)(DENSE_BASE + Base), Size,

-		   prot, MAP_SHARED, fd,

-		   (off_t) (bus_base + Base));

-

-    /*

-     * Do SPARSE mmap only when MMIO and not MMIO_32BIT, or FRAMEBUFFER

-     * and SPARSE (which should require the use of read/write macros).

-     *

-     * By not SPARSE mmapping an 8MB framebuffer, we can save approx. 256K

-     * bytes worth of pagetable (32 pages).

-     */

-    if (((flags & VIDMEM_MMIO) && !(flags & VIDMEM_MMIO_32BIT)) ||

-	((flags & VIDMEM_FRAMEBUFFER) && (flags & VIDMEM_SPARSE)))

-    {

-        rets = (unsigned long)mmap((caddr_t)(SPARSE_BASE + (Base << 5)),

-				   Size << 5, prot, MAP_SHARED, fd,

-				   (off_t) _bus_base_sparse() + (Base << 5));

-    }

-

-    close(fd);

-      

-    if (ret == (unsigned long)MAP_FAILED) {

-        FatalError("xf86MapVidMemSparse: Could not (dense) mmap fb (%s)\n",

-		   strerror(errno));

-    }

-

-    if (((flags & VIDMEM_MMIO) && !(flags & VIDMEM_MMIO_32BIT)) ||

-	((flags & VIDMEM_FRAMEBUFFER) && (flags & VIDMEM_SPARSE)))

-    {

-        if (rets == (unsigned long)MAP_FAILED ||

-	    rets != (SPARSE_BASE + (Base << 5)))

-	{

-	    FatalError("mapVidMemSparse: Could not (sparse) mmap fb (%s)\n",

-		       strerror(errno));

-	}

-    }

-

-#if 1

-    if (rets)

-        xf86Msg(X_INFO,"mapVidMemSparse: mapped Base 0x%lx size 0x%lx"

-		" to DENSE at 0x%lx and SPARSE at 0x%lx\n",

-		Base, Size, ret, rets);

-    else

-        xf86Msg(X_INFO,"mapVidMemSparse: mapped Base 0x%lx size 0x%lx"

-		" to DENSE only at 0x%lx\n",

-		Base, Size, ret);

-

-#endif

-    return (pointer) ret;

-}

-

-static void

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

-{

-    unsigned long Offset = (unsigned long)Base - DENSE_BASE;

-#if 1

-    xf86Msg(X_INFO,"unmapVidMemSparse: unmapping Base 0x%lx Size 0x%lx\n",

-	    Base, Size);

-#endif

-    /* Unmap DENSE always. */

-    munmap((caddr_t)Base, Size);

-

-    /* Unmap SPARSE always, and ignore error in case we did not map it. */

-    munmap((caddr_t)(SPARSE_BASE + (Offset << 5)), Size << 5);

-}

-

-static int

-readSparse8(pointer Base, register unsigned long Offset)

-{

-    register unsigned long result, shift;

-    register unsigned long msb;

-

-    mem_barrier();

-    Offset += (unsigned long)Base - DENSE_BASE;

-    shift = (Offset & 0x3) << 3;

-    if (Offset >= (hae_thresh)) {

-        msb = Offset & hae_mask;

-        Offset -= msb;

-	if (msb_set != msb) {

-	    sethae(msb);

-	    msb_set = msb;

-	}

-    }

-

-    mem_barrier();

-    result = *(vuip) (SPARSE_BASE + (Offset << 5));

-    result >>= shift;

-    return 0xffUL & result;

-}

-

-static int

-readSparse16(pointer Base, register unsigned long Offset)

-{

-    register unsigned long result, shift;

-    register unsigned long msb;

-

-    mem_barrier();

-    Offset += (unsigned long)Base - DENSE_BASE;

-    shift = (Offset & 0x2) << 3;

-    if (Offset >= hae_thresh) {

-        msb = Offset & hae_mask;

-        Offset -= msb;

-	if (msb_set != msb) {

-	    sethae(msb);

-	    msb_set = msb;

-	}

-    }

-

-    mem_barrier();

-    result = *(vuip)(SPARSE_BASE + (Offset<<5) + (1<<(5-2)));

-    result >>= shift;

-    return 0xffffUL & result;

-}

-

-static int

-readSparse32(pointer Base, register unsigned long Offset)

-{

-    /* NOTE: this is really using DENSE. */

-    mem_barrier();

-    return *(vuip)((unsigned long)Base+(Offset));

-}

-

-static void

-writeSparse8(int Value, pointer Base, register unsigned long Offset)

-{

-    register unsigned long msb;

-    register unsigned int b = Value & 0xffU;

-

-    write_mem_barrier();

-    Offset += (unsigned long)Base - DENSE_BASE;

-    if (Offset >= hae_thresh) {

-        msb = Offset & hae_mask;

-	Offset -= msb;

-	if (msb_set != msb) {

-	    sethae(msb); 

-	    msb_set = msb;

-	}

-    }

-

-    write_mem_barrier();

-    *(vuip) (SPARSE_BASE + (Offset << 5)) = b * 0x01010101;

-}

-

-static void

-writeSparse16(int Value, pointer Base, register unsigned long Offset)

-{

-    register unsigned long msb;

-    register unsigned int w = Value & 0xffffU;

-

-    write_mem_barrier();

-    Offset += (unsigned long)Base - DENSE_BASE;

-    if (Offset >= hae_thresh) {

-        msb = Offset & hae_mask;

-	Offset -= msb;

-	if (msb_set != msb) {

-	    sethae(msb);

-	    msb_set = msb;

-	}

-    }

-

-    write_mem_barrier();

-    *(vuip)(SPARSE_BASE + (Offset<<5) + (1<<(5-2))) = w * 0x00010001;

-}

-

-static void

-writeSparse32(int Value, pointer Base, register unsigned long Offset)

-{

-    /* NOTE: this is really using DENSE. */

-    write_mem_barrier();

-    *(vuip)((unsigned long)Base + (Offset)) = Value;

-    return;

-}

-

-static void

-writeSparseNB8(int Value, pointer Base, register unsigned long Offset)

-{

-    register unsigned long msb;

-    register unsigned int b = Value & 0xffU;

-

-    Offset += (unsigned long)Base - DENSE_BASE;

-    if (Offset >= hae_thresh) {

-        msb = Offset & hae_mask;

-	Offset -= msb;

-	if (msb_set != msb) {

-	    sethae(msb);

-	    msb_set = msb;

-	}

-    }

-    *(vuip) (SPARSE_BASE + (Offset << 5)) = b * 0x01010101;

-}

-

-static void

-writeSparseNB16(int Value, pointer Base, register unsigned long Offset)

-{

-    register unsigned long msb;

-    register unsigned int w = Value & 0xffffU;

-

-    Offset += (unsigned long)Base - DENSE_BASE;

-    if (Offset >= hae_thresh) {

-        msb = Offset & hae_mask;

-	Offset -= msb;

-	if (msb_set != msb) {

-	    sethae(msb);

-	    msb_set = msb;

-	}

-    }

-    *(vuip)(SPARSE_BASE+(Offset<<5)+(1<<(5-2))) = w * 0x00010001;

-}

-

-static void

-writeSparseNB32(int Value, pointer Base, register unsigned long Offset)

-{

-    /* NOTE: this is really using DENSE. */

-    *(vuip)((unsigned long)Base + (Offset)) = Value;

-    return;

-}

-

-void (*xf86WriteMmio8)(int Value, pointer Base, unsigned long Offset)

-     = writeDense8;

-void (*xf86WriteMmio16)(int Value, pointer Base, unsigned long Offset)

-     = writeDense16;

-void (*xf86WriteMmio32)(int Value, pointer Base, unsigned long Offset)

-     = writeDense32;

-void (*xf86WriteMmioNB8)(int Value, pointer Base, unsigned long Offset)

-     = writeDenseNB8;

-void (*xf86WriteMmioNB16)(int Value, pointer Base, unsigned long Offset)

-     = writeDenseNB16;

-void (*xf86WriteMmioNB32)(int Value, pointer Base, unsigned long Offset)

-     = writeDenseNB32;

-int  (*xf86ReadMmio8)(pointer Base, unsigned long Offset)

-     = readDense8;

-int  (*xf86ReadMmio16)(pointer Base, unsigned long Offset)

-     = readDense16;

-int  (*xf86ReadMmio32)(pointer Base, unsigned long Offset)

-     = readDense32;

-

-#endif /* __alpha__ */

+/*
+ * Copyright 1992 by Orest Zborowski <obz@Kodak.com>
+ * 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 names of Orest Zborowski and David Wexelblat
+ * not be used in advertising or publicity pertaining to distribution of
+ * the software without specific, written prior permission.  Orest Zborowski
+ * and David Wexelblat make no representations about the suitability of this
+ * software for any purpose.  It is provided "as is" without express or
+ * implied warranty.
+ *
+ * OREST ZBOROWSKI AND DAVID WEXELBLAT DISCLAIMS ALL WARRANTIES WITH REGARD
+ * TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS, IN NO EVENT SHALL OREST ZBOROWSKI OR 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 <errno.h>
+#include <string.h>
+
+#include <X11/X.h>
+#include "input.h"
+#include "scrnintstr.h"
+
+#include "xf86.h"
+#include "xf86Priv.h"
+#include "xf86_OSlib.h"
+#include "xf86OSpriv.h"
+#ifdef __alpha__
+#include "shared/xf86Axp.h"
+#endif
+
+#ifdef HAS_MTRR_SUPPORT
+#include <asm/mtrr.h>
+#endif
+
+static Bool ExtendedEnabled = FALSE;
+
+#ifdef __ia64__
+
+#include "compiler.h"
+#include <sys/io.h>
+
+#elif !defined(__powerpc__) && \
+      !defined(__mc68000__) && \
+      !defined(__sparc__) && \
+      !defined(__mips__) && \
+      !defined(__nds32__) && \
+      !defined(__arm__)
+
+/*
+ * Due to conflicts with "compiler.h", don't rely on <sys/io.h> to declare
+ * these.
+ */
+extern int ioperm(unsigned long __from, unsigned long __num, int __turn_on);
+extern int iopl(int __level);
+
+#endif
+
+#ifdef __alpha__
+# define BUS_BASE bus_base
+#else 
+#define BUS_BASE (0)
+#endif /*  __alpha__ */
+
+/***************************************************************************/
+/* Video Memory Mapping section                                            */
+/***************************************************************************/
+
+static pointer mapVidMem(int, unsigned long, unsigned long, int);
+static void unmapVidMem(int, pointer, unsigned long);
+#if defined (__alpha__) 
+extern void sethae(unsigned long hae);
+extern unsigned long _bus_base __P ((void)) __attribute__ ((const));
+extern unsigned long _bus_base_sparse __P ((void)) __attribute__ ((const));
+
+static pointer mapVidMemSparse(int, unsigned long, unsigned long, int);
+extern axpDevice lnxGetAXP(void);
+static void unmapVidMemSparse(int, pointer, unsigned long);
+static axpDevice axpSystem = -1;
+static Bool needSparse;
+static unsigned long hae_thresh;
+static unsigned long hae_mask;
+static unsigned long bus_base;
+#endif
+
+#ifdef HAS_MTRR_SUPPORT
+
+#define SPLIT_WC_REGIONS 1
+
+static pointer setWC(int, unsigned long, unsigned long, Bool, MessageType);
+static void undoWC(int, pointer);
+
+/* The file desc for /proc/mtrr. Once opened, left opened, and the mtrr
+   driver will clean up when we exit. */
+#define MTRR_FD_UNOPENED (-1)	/* We have yet to open /proc/mtrr */
+#define MTRR_FD_PROBLEM (-2)	/* We tried to open /proc/mtrr, but had
+				   a problem. */
+static int mtrr_fd = MTRR_FD_UNOPENED;
+
+/* Open /proc/mtrr. FALSE on failure. Will always fail on Linux 2.0, 
+   and will fail on Linux 2.2 with MTRR support configured out,
+   so verbosity should be chosen appropriately. */
+static Bool
+mtrr_open(int verbosity)
+{
+	/* Only report absence of /proc/mtrr once. */
+	static Bool warned = FALSE;
+
+	if (mtrr_fd == MTRR_FD_UNOPENED) { 
+		mtrr_fd = open("/proc/mtrr", O_WRONLY);
+
+		if (mtrr_fd < 0)
+			mtrr_fd = MTRR_FD_PROBLEM;
+	}
+
+	if (mtrr_fd == MTRR_FD_PROBLEM) {
+		/* To make sure we only ever warn once, need to check
+		   verbosity outside xf86MsgVerb */
+		if (!warned && verbosity <= xf86GetVerbosity()) {
+			xf86MsgVerb(X_WARNING, verbosity,
+				  "System lacks support for changing MTRRs\n");
+			warned = TRUE;
+		}
+
+		return FALSE;
+	}
+	else
+		return TRUE;
+}
+
+/*
+ * We maintain a list of WC regions for each physical mapping so they can
+ * be undone when unmapping.
+ */
+
+struct mtrr_wc_region {
+	struct mtrr_sentry	sentry;
+	Bool			added;		/* added WC or removed it */
+	struct mtrr_wc_region *	next;
+};
+
+
+static struct mtrr_wc_region *
+mtrr_cull_wc_region(int screenNum, unsigned long base, unsigned long size,
+		      MessageType from)
+{
+	/* Some BIOS writers thought that setting wc over the mmio
+	   region of a graphics devices was a good idea. Try to fix
+	   it. */
+
+	struct mtrr_gentry gent;
+	struct mtrr_wc_region *wcreturn = NULL, *wcr;
+	int count, ret=0;
+
+	/* Linux 2.0 users should not get a warning without -verbose */
+	if (!mtrr_open(2))
+		return NULL;
+
+	for (gent.regnum = 0; 
+	     ioctl(mtrr_fd, MTRRIOC_GET_ENTRY, &gent) >= 0;
+	     gent.regnum++) {
+		if (gent.type != MTRR_TYPE_WRCOMB
+		    || gent.base + gent.size <= base
+		    || base + size <= gent.base)
+			continue;
+
+		/* Found an overlapping region. Delete it. */
+		
+		wcr = malloc(sizeof(*wcr));
+		if (!wcr)
+			return NULL;
+		wcr->sentry.base = gent.base;
+		wcr->sentry.size = gent.size;
+		wcr->sentry.type = MTRR_TYPE_WRCOMB;
+		wcr->added = FALSE;
+		
+		count = 3;
+		while (count-- && 
+		       (ret = ioctl(mtrr_fd, MTRRIOC_KILL_ENTRY, &(wcr->sentry))) < 0);
+		
+		if (ret >= 0) {
+			xf86DrvMsg(screenNum, from,
+				   "Removed MMIO write-combining range "
+				   "(0x%lx,0x%lx)\n",
+				   (unsigned long) gent.base, (unsigned long) gent.size);
+			wcr->next = wcreturn;
+			wcreturn = wcr;
+			gent.regnum--;
+		} else {
+			free(wcr);
+			xf86DrvMsgVerb(screenNum, X_WARNING, 0,
+				   "Failed to remove MMIO "
+				   "write-combining range (0x%lx,0x%lx)\n",
+				       gent.base, (unsigned long) gent.size);
+		}
+	}
+	return wcreturn;
+}
+
+
+static struct mtrr_wc_region *
+mtrr_remove_offending(int screenNum, unsigned long base, unsigned long size,
+		      MessageType from)
+{
+    struct mtrr_gentry gent;
+    struct mtrr_wc_region *wcreturn = NULL, **wcr;
+
+    if (!mtrr_open(2))
+	return NULL;
+
+    wcr = &wcreturn;
+    for (gent.regnum = 0; 
+	 ioctl(mtrr_fd, MTRRIOC_GET_ENTRY, &gent) >= 0; gent.regnum++ ) {
+	if (gent.type == MTRR_TYPE_WRCOMB
+	    && ((gent.base >= base && gent.base + gent.size < base + size) || 
+		(gent.base >  base && gent.base + gent.size <= base + size))) {
+	    *wcr = mtrr_cull_wc_region(screenNum, gent.base, gent.size, from);
+	    if (*wcr) gent.regnum--;
+	    while(*wcr) {
+		wcr = &((*wcr)->next);
+	    }
+	}
+    }
+    return wcreturn;
+}
+
+
+static struct mtrr_wc_region *
+mtrr_add_wc_region(int screenNum, unsigned long base, unsigned long size,
+		   MessageType from)
+{
+        struct mtrr_wc_region **wcr, *wcreturn, *curwcr;
+
+       /*
+        * There can be only one....
+        */
+
+	wcreturn = mtrr_remove_offending(screenNum, base, size, from);
+	wcr = &wcreturn;
+	while (*wcr) {
+	    wcr = &((*wcr)->next);
+	} 
+
+	/* Linux 2.0 should not warn, unless the user explicitly asks for
+	   WC. */
+
+	if (!mtrr_open(from == X_CONFIG ? 0 : 2))
+		return wcreturn;
+
+	*wcr = curwcr = malloc(sizeof(**wcr));
+	if (!curwcr)
+	    return wcreturn;
+
+	curwcr->sentry.base = base;
+	curwcr->sentry.size = size;
+	curwcr->sentry.type = MTRR_TYPE_WRCOMB;
+	curwcr->added = TRUE;
+	curwcr->next = NULL;
+
+#if SPLIT_WC_REGIONS
+	/*
+	 * Splits up the write-combining region if it is not aligned on a
+ 	 * size boundary.
+	 */
+
+	{
+	    unsigned long lbase, d_size = 1;
+	    unsigned long n_size = size;
+	    unsigned long n_base = base;
+
+	    for (lbase = n_base, d_size = 1; !(lbase & 1);
+		 lbase = lbase >> 1, d_size <<= 1);
+	    while (d_size > n_size)
+		d_size = d_size >> 1;
+	    DebugF("WC_BASE: 0x%lx WC_END: 0x%lx\n",base,base+d_size-1);
+	    n_base += d_size;
+	    n_size -= d_size;
+	    if (n_size) {
+		xf86DrvMsgVerb(screenNum,X_INFO,3,"Splitting WC range: "
+			       "base: 0x%lx, size: 0x%lx\n",base,size);
+		curwcr->next = mtrr_add_wc_region(screenNum, n_base, n_size,from);
+	    }
+	    curwcr->sentry.size = d_size;
+	} 
+	
+	/*****************************************************************/
+#endif /* SPLIT_WC_REGIONS */
+
+	if (ioctl(mtrr_fd, MTRRIOC_ADD_ENTRY, &curwcr->sentry) >= 0) {
+		/* Avoid printing on every VT switch */
+		if (xf86ServerIsInitialising()) {
+			xf86DrvMsg(screenNum, from,
+				   "Write-combining range (0x%lx,0x%lx)\n",
+				   base, size);
+		}
+		return wcreturn;
+	}
+	else {
+	        *wcr = curwcr->next;
+		free(curwcr);
+		
+		/* Don't complain about the VGA region: MTRR fixed
+		   regions aren't currently supported, but might be in
+		   the future. */
+		if ((unsigned long)base >= 0x100000) {
+			xf86DrvMsgVerb(screenNum, X_WARNING, 0,
+				"Failed to set up write-combining range "
+				"(0x%lx,0x%lx)\n", base, size);
+		}
+		return wcreturn;
+	}
+}
+
+static void
+mtrr_undo_wc_region(int screenNum, struct mtrr_wc_region *wcr)
+{
+	struct mtrr_wc_region *p, *prev;
+
+	if (mtrr_fd >= 0) {
+		p = wcr;
+		while (p) {
+			if (p->added)
+				ioctl(mtrr_fd, MTRRIOC_DEL_ENTRY, &p->sentry);
+			prev = p;
+			p = p->next;
+			free(prev);
+		}
+	}
+}
+
+static pointer
+setWC(int screenNum, unsigned long base, unsigned long size, Bool enable,
+      MessageType from)
+{
+	if (enable)
+		return mtrr_add_wc_region(screenNum, base, size, from);
+	else
+		return mtrr_cull_wc_region(screenNum, base, size, from);
+}
+
+static void
+undoWC(int screenNum, pointer regioninfo)
+{
+	mtrr_undo_wc_region(screenNum, regioninfo);
+}
+
+#endif /* HAS_MTRR_SUPPORT */
+
+void
+xf86OSInitVidMem(VidMemInfoPtr pVidMem)
+{
+	pVidMem->linearSupported = TRUE;
+#ifdef __alpha__
+	if (axpSystem == -1) {
+	  axpSystem = lnxGetAXP();
+	  if ((needSparse = (_bus_base_sparse() > 0))) {
+	    hae_thresh = xf86AXPParams[axpSystem].hae_thresh;
+	    hae_mask = xf86AXPParams[axpSystem].hae_mask;
+	  }
+	  bus_base = _bus_base();
+	}
+	if (needSparse) {
+	  xf86Msg(X_INFO,"Machine needs sparse mapping\n");
+	  pVidMem->mapMem = mapVidMemSparse;
+	  pVidMem->unmapMem = unmapVidMemSparse;
+	} else {
+	  xf86Msg(X_INFO,"Machine type has 8/16 bit access\n");
+	  pVidMem->mapMem = mapVidMem;
+	  pVidMem->unmapMem = unmapVidMem;
+	}	
+#else
+	pVidMem->mapMem = mapVidMem;
+	pVidMem->unmapMem = unmapVidMem;
+#endif /* __alpha__ */
+
+
+#ifdef HAS_MTRR_SUPPORT
+	pVidMem->setWC = setWC;
+	pVidMem->undoWC = undoWC;
+#endif
+	pVidMem->initialised = TRUE;
+}
+
+#ifdef __sparc__
+/* Basically, you simply cannot do this on Sparc.  You have to do something portable
+ * like use /dev/fb* or mmap() on /proc/bus/pci/X/Y nodes. -DaveM
+ */
+static pointer mapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int flags)
+{
+	return NULL;
+}
+#else
+static pointer
+mapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int flags)
+{
+    pointer base;
+    int fd;
+    int mapflags = MAP_SHARED; 
+    int prot;
+    memType realBase, alignOff;
+
+    realBase = Base & ~(getpagesize() - 1);
+    alignOff = Base - realBase;
+    DebugF("base: %lx, realBase: %lx, alignOff: %lx \n",
+	   Base,realBase,alignOff);
+
+#if defined(__ia64__) || defined(__arm__) || defined(__s390__)
+#ifndef MAP_WRITECOMBINED
+#define MAP_WRITECOMBINED 0x00010000
+#endif
+#ifndef MAP_NONCACHED
+#define MAP_NONCACHED 0x00020000
+#endif
+    if(flags & VIDMEM_FRAMEBUFFER) 
+        mapflags |= MAP_WRITECOMBINED; 
+    else
+        mapflags |= MAP_NONCACHED; 
+#endif
+
+#if 0
+    /* this will disappear when people upgrade their kernels */
+    fd = open(DEV_MEM,
+	      ((flags & VIDMEM_READONLY) ? O_RDONLY : O_RDWR) | O_SYNC);
+#else
+    fd = open(DEV_MEM, (flags & VIDMEM_READONLY) ? O_RDONLY : O_RDWR);
+#endif
+    if (fd < 0)
+    {
+	FatalError("xf86MapVidMem: failed to open " DEV_MEM " (%s)\n",
+		   strerror(errno));
+    }
+
+    if (flags & VIDMEM_READONLY)
+	prot = PROT_READ;
+    else
+	prot = PROT_READ | PROT_WRITE;
+
+    /* This requires linux-0.99.pl10 or above */
+    base = mmap((caddr_t)0, Size + alignOff, prot, mapflags, fd,
+ 		(off_t)realBase  + BUS_BASE);
+    close(fd);
+    if (base == MAP_FAILED) {
+        FatalError("xf86MapVidMem: Could not mmap framebuffer"
+		   " (0x%08lx,0x%lx) (%s)\n", Base, Size,
+		   strerror(errno));
+    }
+    DebugF("base: %lx aligned base: %lx\n",base, (char *)base + alignOff);
+    return (char *)base + alignOff;
+}
+#endif /* !(__sparc__) */
+    
+static void
+unmapVidMem(int ScreenNum, pointer Base, unsigned long Size)
+{
+    memType alignOff = (memType)Base 
+	- ((memType)Base & ~(getpagesize() - 1));
+
+    DebugF("alignment offset: %lx\n",alignOff);
+    munmap((caddr_t)((memType)Base - alignOff), (Size + alignOff));
+}
+
+
+/***************************************************************************/
+/* I/O Permissions section                                                 */
+/***************************************************************************/
+
+#if defined(__powerpc__)
+volatile unsigned char *ioBase = NULL;
+
+#ifndef __NR_pciconfig_iobase
+#define __NR_pciconfig_iobase	200
+#endif
+
+#endif
+
+Bool
+xf86EnableIO(void)
+{
+#if defined(__powerpc__)
+	int fd;
+	unsigned int ioBase_phys;
+#endif
+
+	if (ExtendedEnabled)
+		return TRUE;
+
+#if defined(__powerpc__)
+	ioBase_phys = syscall(__NR_pciconfig_iobase, 2, 0, 0);
+
+	fd = open("/dev/mem", O_RDWR);
+	if (ioBase == NULL) {
+		ioBase = (volatile unsigned char *)mmap(0, 0x20000,
+				PROT_READ | PROT_WRITE, MAP_SHARED, fd,
+				ioBase_phys);
+/* Should this be fatal or just a warning? */
+#if 0
+		if (ioBase == MAP_FAILED) {
+		    xf86Msg(X_WARNING,
+			    "xf86EnableIOPorts: Failed to map iobase (%s)\n",
+			    strerror(errno));
+		    return FALSE;
+		}
+#endif
+	}
+	close(fd);
+#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__) && !defined(__m32r__) && !defined(__nds32__)
+        if (ioperm(0, 1024, 1) || iopl(3)) {
+                if (errno == ENODEV)
+                        ErrorF("xf86EnableIOPorts: no I/O ports found\n");
+                else
+                        FatalError("xf86EnableIOPorts: failed to set IOPL"
+                                   " for I/O (%s)\n", strerror(errno));
+		return FALSE;
+        }
+# if !defined(__alpha__)
+	/* XXX: this is actually not trapping anything because of iopl(3)
+	 * above */
+	ioperm(0x40,4,0); /* trap access to the timer chip */
+	ioperm(0x60,4,0); /* trap access to the keyboard controller */
+# endif
+#endif
+	ExtendedEnabled = TRUE;
+
+	return TRUE;
+}
+
+void
+xf86DisableIO(void)
+{
+	if (!ExtendedEnabled)
+		return;
+#if defined(__powerpc__)
+	munmap(ioBase, 0x20000);
+	ioBase = NULL;
+#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__arm__) && !defined(__s390__) && !defined(__m32r__) && !defined(__nds32__)
+	iopl(0);
+	ioperm(0, 1024, 0);
+#endif
+	ExtendedEnabled = FALSE;
+
+	return;
+}
+
+#if defined (__alpha__)
+
+#define vuip    volatile unsigned int *
+
+extern int readDense8(pointer Base, register unsigned long Offset);
+extern int readDense16(pointer Base, register unsigned long Offset);
+extern int readDense32(pointer Base, register unsigned long Offset);
+extern void
+writeDenseNB8(int Value, pointer Base, register unsigned long Offset);
+extern void
+writeDenseNB16(int Value, pointer Base, register unsigned long Offset);
+extern void
+writeDenseNB32(int Value, pointer Base, register unsigned long Offset);
+extern void
+writeDense8(int Value, pointer Base, register unsigned long Offset);
+extern void
+writeDense16(int Value, pointer Base, register unsigned long Offset);
+extern void
+writeDense32(int Value, pointer Base, register unsigned long Offset);
+
+static int readSparse8(pointer Base, register unsigned long Offset);
+static int readSparse16(pointer Base, register unsigned long Offset);
+static int readSparse32(pointer Base, register unsigned long Offset);
+static void
+writeSparseNB8(int Value, pointer Base, register unsigned long Offset);
+static void
+writeSparseNB16(int Value, pointer Base, register unsigned long Offset);
+static void
+writeSparseNB32(int Value, pointer Base, register unsigned long Offset);
+static void
+writeSparse8(int Value, pointer Base, register unsigned long Offset);
+static void
+writeSparse16(int Value, pointer Base, register unsigned long Offset);
+static void
+writeSparse32(int Value, pointer Base, register unsigned long Offset);
+
+#define DENSE_BASE	0x2ff00000000UL
+#define SPARSE_BASE	0x30000000000UL
+
+static unsigned long msb_set = 0;
+
+static pointer
+mapVidMemSparse(int ScreenNum, unsigned long Base, unsigned long Size, int flags)
+{
+    int fd, prot;
+    unsigned long ret, rets = 0;
+
+    static Bool was_here = FALSE;
+
+    if (!was_here) {
+      was_here = TRUE;
+
+      xf86WriteMmio8 = writeSparse8;
+      xf86WriteMmio16 = writeSparse16;
+      xf86WriteMmio32 = writeSparse32;
+      xf86WriteMmioNB8 = writeSparseNB8;
+      xf86WriteMmioNB16 = writeSparseNB16;
+      xf86WriteMmioNB32 = writeSparseNB32;
+      xf86ReadMmio8 = readSparse8;
+      xf86ReadMmio16 = readSparse16;
+      xf86ReadMmio32 = readSparse32;
+    }
+	
+    fd = open(DEV_MEM, (flags & VIDMEM_READONLY) ? O_RDONLY : O_RDWR);
+    if (fd < 0) {
+        FatalError("xf86MapVidMem: failed to open " DEV_MEM " (%s)\n",
+		   strerror(errno));
+    }
+
+#if 0
+    xf86Msg(X_INFO,"mapVidMemSparse: try Base 0x%lx size 0x%lx flags 0x%x\n",
+	    Base, Size, flags);
+#endif
+
+    if (flags & VIDMEM_READONLY)
+	prot = PROT_READ;
+    else
+	prot = PROT_READ | PROT_WRITE;
+
+    /* This requirers linux-0.99.pl10 or above */
+
+    /*
+     * Always do DENSE mmap, since read32/write32 currently require it.
+     */
+    ret = (unsigned long)mmap((caddr_t)(DENSE_BASE + Base), Size,
+		   prot, MAP_SHARED, fd,
+		   (off_t) (bus_base + Base));
+
+    /*
+     * Do SPARSE mmap only when MMIO and not MMIO_32BIT, or FRAMEBUFFER
+     * and SPARSE (which should require the use of read/write macros).
+     *
+     * By not SPARSE mmapping an 8MB framebuffer, we can save approx. 256K
+     * bytes worth of pagetable (32 pages).
+     */
+    if (((flags & VIDMEM_MMIO) && !(flags & VIDMEM_MMIO_32BIT)) ||
+	((flags & VIDMEM_FRAMEBUFFER) && (flags & VIDMEM_SPARSE)))
+    {
+        rets = (unsigned long)mmap((caddr_t)(SPARSE_BASE + (Base << 5)),
+				   Size << 5, prot, MAP_SHARED, fd,
+				   (off_t) _bus_base_sparse() + (Base << 5));
+    }
+
+    close(fd);
+      
+    if (ret == (unsigned long)MAP_FAILED) {
+        FatalError("xf86MapVidMemSparse: Could not (dense) mmap fb (%s)\n",
+		   strerror(errno));
+    }
+
+    if (((flags & VIDMEM_MMIO) && !(flags & VIDMEM_MMIO_32BIT)) ||
+	((flags & VIDMEM_FRAMEBUFFER) && (flags & VIDMEM_SPARSE)))
+    {
+        if (rets == (unsigned long)MAP_FAILED ||
+	    rets != (SPARSE_BASE + (Base << 5)))
+	{
+	    FatalError("mapVidMemSparse: Could not (sparse) mmap fb (%s)\n",
+		       strerror(errno));
+	}
+    }
+
+#if 1
+    if (rets)
+        xf86Msg(X_INFO,"mapVidMemSparse: mapped Base 0x%lx size 0x%lx"
+		" to DENSE at 0x%lx and SPARSE at 0x%lx\n",
+		Base, Size, ret, rets);
+    else
+        xf86Msg(X_INFO,"mapVidMemSparse: mapped Base 0x%lx size 0x%lx"
+		" to DENSE only at 0x%lx\n",
+		Base, Size, ret);
+
+#endif
+    return (pointer) ret;
+}
+
+static void
+unmapVidMemSparse(int ScreenNum, pointer Base, unsigned long Size)
+{
+    unsigned long Offset = (unsigned long)Base - DENSE_BASE;
+#if 1
+    xf86Msg(X_INFO,"unmapVidMemSparse: unmapping Base 0x%lx Size 0x%lx\n",
+	    Base, Size);
+#endif
+    /* Unmap DENSE always. */
+    munmap((caddr_t)Base, Size);
+
+    /* Unmap SPARSE always, and ignore error in case we did not map it. */
+    munmap((caddr_t)(SPARSE_BASE + (Offset << 5)), Size << 5);
+}
+
+static int
+readSparse8(pointer Base, register unsigned long Offset)
+{
+    register unsigned long result, shift;
+    register unsigned long msb;
+
+    mem_barrier();
+    Offset += (unsigned long)Base - DENSE_BASE;
+    shift = (Offset & 0x3) << 3;
+    if (Offset >= (hae_thresh)) {
+        msb = Offset & hae_mask;
+        Offset -= msb;
+	if (msb_set != msb) {
+	    sethae(msb);
+	    msb_set = msb;
+	}
+    }
+
+    mem_barrier();
+    result = *(vuip) (SPARSE_BASE + (Offset << 5));
+    result >>= shift;
+    return 0xffUL & result;
+}
+
+static int
+readSparse16(pointer Base, register unsigned long Offset)
+{
+    register unsigned long result, shift;
+    register unsigned long msb;
+
+    mem_barrier();
+    Offset += (unsigned long)Base - DENSE_BASE;
+    shift = (Offset & 0x2) << 3;
+    if (Offset >= hae_thresh) {
+        msb = Offset & hae_mask;
+        Offset -= msb;
+	if (msb_set != msb) {
+	    sethae(msb);
+	    msb_set = msb;
+	}
+    }
+
+    mem_barrier();
+    result = *(vuip)(SPARSE_BASE + (Offset<<5) + (1<<(5-2)));
+    result >>= shift;
+    return 0xffffUL & result;
+}
+
+static int
+readSparse32(pointer Base, register unsigned long Offset)
+{
+    /* NOTE: this is really using DENSE. */
+    mem_barrier();
+    return *(vuip)((unsigned long)Base+(Offset));
+}
+
+static void
+writeSparse8(int Value, pointer Base, register unsigned long Offset)
+{
+    register unsigned long msb;
+    register unsigned int b = Value & 0xffU;
+
+    write_mem_barrier();
+    Offset += (unsigned long)Base - DENSE_BASE;
+    if (Offset >= hae_thresh) {
+        msb = Offset & hae_mask;
+	Offset -= msb;
+	if (msb_set != msb) {
+	    sethae(msb); 
+	    msb_set = msb;
+	}
+    }
+
+    write_mem_barrier();
+    *(vuip) (SPARSE_BASE + (Offset << 5)) = b * 0x01010101;
+}
+
+static void
+writeSparse16(int Value, pointer Base, register unsigned long Offset)
+{
+    register unsigned long msb;
+    register unsigned int w = Value & 0xffffU;
+
+    write_mem_barrier();
+    Offset += (unsigned long)Base - DENSE_BASE;
+    if (Offset >= hae_thresh) {
+        msb = Offset & hae_mask;
+	Offset -= msb;
+	if (msb_set != msb) {
+	    sethae(msb);
+	    msb_set = msb;
+	}
+    }
+
+    write_mem_barrier();
+    *(vuip)(SPARSE_BASE + (Offset<<5) + (1<<(5-2))) = w * 0x00010001;
+}
+
+static void
+writeSparse32(int Value, pointer Base, register unsigned long Offset)
+{
+    /* NOTE: this is really using DENSE. */
+    write_mem_barrier();
+    *(vuip)((unsigned long)Base + (Offset)) = Value;
+    return;
+}
+
+static void
+writeSparseNB8(int Value, pointer Base, register unsigned long Offset)
+{
+    register unsigned long msb;
+    register unsigned int b = Value & 0xffU;
+
+    Offset += (unsigned long)Base - DENSE_BASE;
+    if (Offset >= hae_thresh) {
+        msb = Offset & hae_mask;
+	Offset -= msb;
+	if (msb_set != msb) {
+	    sethae(msb);
+	    msb_set = msb;
+	}
+    }
+    *(vuip) (SPARSE_BASE + (Offset << 5)) = b * 0x01010101;
+}
+
+static void
+writeSparseNB16(int Value, pointer Base, register unsigned long Offset)
+{
+    register unsigned long msb;
+    register unsigned int w = Value & 0xffffU;
+
+    Offset += (unsigned long)Base - DENSE_BASE;
+    if (Offset >= hae_thresh) {
+        msb = Offset & hae_mask;
+	Offset -= msb;
+	if (msb_set != msb) {
+	    sethae(msb);
+	    msb_set = msb;
+	}
+    }
+    *(vuip)(SPARSE_BASE+(Offset<<5)+(1<<(5-2))) = w * 0x00010001;
+}
+
+static void
+writeSparseNB32(int Value, pointer Base, register unsigned long Offset)
+{
+    /* NOTE: this is really using DENSE. */
+    *(vuip)((unsigned long)Base + (Offset)) = Value;
+    return;
+}
+
+void (*xf86WriteMmio8)(int Value, pointer Base, unsigned long Offset)
+     = writeDense8;
+void (*xf86WriteMmio16)(int Value, pointer Base, unsigned long Offset)
+     = writeDense16;
+void (*xf86WriteMmio32)(int Value, pointer Base, unsigned long Offset)
+     = writeDense32;
+void (*xf86WriteMmioNB8)(int Value, pointer Base, unsigned long Offset)
+     = writeDenseNB8;
+void (*xf86WriteMmioNB16)(int Value, pointer Base, unsigned long Offset)
+     = writeDenseNB16;
+void (*xf86WriteMmioNB32)(int Value, pointer Base, unsigned long Offset)
+     = writeDenseNB32;
+int  (*xf86ReadMmio8)(pointer Base, unsigned long Offset)
+     = readDense8;
+int  (*xf86ReadMmio16)(pointer Base, unsigned long Offset)
+     = readDense16;
+int  (*xf86ReadMmio32)(pointer Base, unsigned long Offset)
+     = readDense32;
+
+#endif /* __alpha__ */
diff --git a/xorg-server/hw/xfree86/os-support/shared/bios_mmap.c b/xorg-server/hw/xfree86/os-support/shared/bios_mmap.c
index a5887f578..b7b35d9db 100644
--- a/xorg-server/hw/xfree86/os-support/shared/bios_mmap.c
+++ b/xorg-server/hw/xfree86/os-support/shared/bios_mmap.c
@@ -1,141 +1,137 @@
-/*

- * 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"

-

-#ifndef MAP_FAILED

-#define MAP_FAILED ((void *)-1)

-#endif

-

-/*

- * Read BIOS via mmap()ing DEV_MEM

- */

-

-#ifndef __alpha__

-int

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

-	     int Len)

-{

-	int fd;

-	unsigned char *ptr;

-	int psize;

-	int mlen;

-

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

-	{

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

-			DEV_MEM, strerror(errno));

-		return -1;

-	}

-	psize = getpagesize();

-	Offset += Base & (psize - 1);

-	Base &= ~(psize - 1);

-	mlen = (Offset + Len + psize - 1) & ~(psize - 1);

-	ptr = (unsigned char *)mmap((caddr_t)0, mlen, PROT_READ,

-					MAP_SHARED, fd, (off_t)Base);

-	if (ptr == MAP_FAILED)

-	{

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

-			DEV_MEM, strerror(errno));

-		close(fd);

-		return -1;

-	}

-	DebugF("xf86ReadBIOS: BIOS at 0x%08x has signature 0x%04x\n",

-		Base, ptr[0] | (ptr[1] << 8));

-	(void)memcpy(Buf, (void *)(ptr + Offset), Len);

-	(void)munmap((caddr_t)ptr, mlen);

-	(void)close(fd);

-	return Len;

-}

-

-#else /* __alpha__ */

-

-  /*

-   *  We trick "mmap" into mapping BUS memory for us via BUS_BASE,

-   *  which is the KSEG address of the start of the DENSE memory

-   *  area.

-   */

-

-  /*

-   * NOTE: there prolly ought to be more validity checks and all

-   *  re: boundaries and sizes and such...

-   */

-

-#ifdef linux

-

-extern unsigned long _bus_base(void);

-#define BUS_BASE _bus_base()

-

-#else

-

-extern u_int64_t dense_base(void);

-#define BUS_BASE dense_base()

-

-#endif

-

-int

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

-	     int Len)

-{

-	caddr_t base;

- 	int fd;

-	int psize;

-	int mlen;

-

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

-	{

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

-			DEV_MEM, strerror(errno));

-		return -1;

-	}

-

-	psize = getpagesize();

-	Offset += Base & (psize - 1);

-	Base &= ~(psize - 1);

-	mlen = (Offset + Len + psize - 1) & ~(psize - 1);

-	base = mmap((caddr_t)0, mlen, PROT_READ,

-		    MAP_SHARED, fd, (off_t)(Base + BUS_BASE));

-

-	if (base == MAP_FAILED)

-	{

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

-			DEV_MEM, strerror(errno));

-		return -1;

-	}

-

-	xf86SlowBCopyFromBus((unsigned char *)(base+Offset), Buf, Len);

-

-	munmap((caddr_t)base, mlen);

-	close(fd);

-	return Len;

-}

-

-#endif /* __alpha__ */

+/*
+ * 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"
+
+/*
+ * Read BIOS via mmap()ing DEV_MEM
+ */
+
+#ifndef __alpha__
+int
+xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf,
+	     int Len)
+{
+	int fd;
+	unsigned char *ptr;
+	int psize;
+	int mlen;
+
+	if ((fd = open(DEV_MEM, O_RDONLY)) < 0)
+	{
+		xf86Msg(X_WARNING, "xf86ReadBIOS: Failed to open %s (%s)\n",
+			DEV_MEM, strerror(errno));
+		return -1;
+	}
+	psize = getpagesize();
+	Offset += Base & (psize - 1);
+	Base &= ~(psize - 1);
+	mlen = (Offset + Len + psize - 1) & ~(psize - 1);
+	ptr = (unsigned char *)mmap((caddr_t)0, mlen, PROT_READ,
+					MAP_SHARED, fd, (off_t)Base);
+	if (ptr == MAP_FAILED)
+	{
+		xf86Msg(X_WARNING, "xf86ReadBIOS: %s mmap failed (%s)\n",
+			DEV_MEM, strerror(errno));
+		close(fd);
+		return -1;
+	}
+	DebugF("xf86ReadBIOS: BIOS at 0x%08x has signature 0x%04x\n",
+		Base, ptr[0] | (ptr[1] << 8));
+	(void)memcpy(Buf, (void *)(ptr + Offset), Len);
+	(void)munmap((caddr_t)ptr, mlen);
+	(void)close(fd);
+	return Len;
+}
+
+#else /* __alpha__ */
+
+  /*
+   *  We trick "mmap" into mapping BUS memory for us via BUS_BASE,
+   *  which is the KSEG address of the start of the DENSE memory
+   *  area.
+   */
+
+  /*
+   * NOTE: there prolly ought to be more validity checks and all
+   *  re: boundaries and sizes and such...
+   */
+
+#ifdef linux
+
+extern unsigned long _bus_base(void);
+#define BUS_BASE _bus_base()
+
+#else
+
+extern u_int64_t dense_base(void);
+#define BUS_BASE dense_base()
+
+#endif
+
+int
+xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf,
+	     int Len)
+{
+	caddr_t base;
+ 	int fd;
+	int psize;
+	int mlen;
+
+	if ((fd = open(DEV_MEM, O_RDONLY)) < 0)
+	{
+		xf86Msg(X_WARNING, "xf86ReadBIOS: Failed to open %s (%s)\n",
+			DEV_MEM, strerror(errno));
+		return -1;
+	}
+
+	psize = getpagesize();
+	Offset += Base & (psize - 1);
+	Base &= ~(psize - 1);
+	mlen = (Offset + Len + psize - 1) & ~(psize - 1);
+	base = mmap((caddr_t)0, mlen, PROT_READ,
+		    MAP_SHARED, fd, (off_t)(Base + BUS_BASE));
+
+	if (base == MAP_FAILED)
+	{
+		xf86Msg(X_WARNING, "xf86ReadBIOS: Failed to mmap %s (%s)\n",
+			DEV_MEM, strerror(errno));
+		return -1;
+	}
+
+	xf86SlowBCopyFromBus((unsigned char *)(base+Offset), Buf, Len);
+
+	munmap((caddr_t)base, mlen);
+	close(fd);
+	return Len;
+}
+
+#endif /* __alpha__ */
diff --git a/xorg-server/hw/xfree86/os-support/xf86_OSlib.h b/xorg-server/hw/xfree86/os-support/xf86_OSlib.h
index 1d5906084..0a5861f49 100644
--- a/xorg-server/hw/xfree86/os-support/xf86_OSlib.h
+++ b/xorg-server/hw/xfree86/os-support/xf86_OSlib.h
@@ -230,20 +230,13 @@
 # include <sys/mman.h>
 # include <sys/stat.h>
 
-# if defined(__bsdi__)
-#  include <sys/param.h>
-# if (_BSDI_VERSION < 199510)
-#  include <i386/isa/vgaioctl.h>
-# endif
-# endif /* __bsdi__ */
-
 #endif /* CSRG_BASED */
 
 /**************************************************************************/
 /* Kernel of *BSD                                                         */
 /**************************************************************************/
 #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || \
- defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__DragonFly__)
+ defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
 
 # include <sys/param.h>
 # if defined(__FreeBSD_version) && !defined(__FreeBSD_kernel_version)
@@ -252,12 +245,6 @@
 
 # if !defined(LINKKIT)
   /* Don't need this stuff for the Link Kit */
-#  if defined(__bsdi__)
-#   include <i386/isa/pcconsioctl.h>
-#   define CONSOLE_X_MODE_ON PCCONIOCRAW
-#   define CONSOLE_X_MODE_OFF PCCONIOCCOOK
-#   define CONSOLE_X_BELL PCCONIOCBEEP
-#  else /* __bsdi__ */
 #   ifdef SYSCONS_SUPPORT
 #    define COMPAT_SYSCONS
 #    if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
@@ -328,7 +315,6 @@
 #ifndef CONSOLE_GET_MEM_INFO 
 #    define CONSOLE_GET_MEM_INFO            _IOR('t',159,struct map_info)
 #endif
-#  endif /* __bsdi__ */
 # endif /* !LINKKIT */
 
 #if defined(USE_I386_IOPL) || defined(USE_AMD64_IOPL)
@@ -337,8 +323,7 @@
 
 # define CLEARDTR_SUPPORT
 
-#endif
-/* __FreeBSD_kernel__ || __NetBSD__ || __OpenBSD__ || __bsdi__ */
+#endif /* __FreeBSD__ || __NetBSD__ || __OpenBSD__ || __DragonFly__ */
 
 /**************************************************************************/
 /* IRIX                                                                   */
@@ -378,8 +363,8 @@
 #define DEV_MEM "/dev/mem"
 #endif
 
-#ifndef VT_SYSREQ_DEFAULT
-#define VT_SYSREQ_DEFAULT FALSE
+#ifndef MAP_FAILED
+#define MAP_FAILED ((void *)-1)
 #endif
 
 #define SYSCALL(call) while(((call) == -1) && (errno == EINTR))