xserver xkeyboard-config libxcb xkbcomp mesa git update 5 Apr 2011

5 files changed, 4016 insertions, 3988 deletions

diff --git a/xorg-server/hw/xfree86/common/xf86Config.c b/xorg-server/hw/xfree86/common/xf86Config.c
index 5312ca60d..114bdc3a3 100644
--- a/xorg-server/hw/xfree86/common/xf86Config.c
+++ b/xorg-server/hw/xfree86/common/xf86Config.c
@@ -309,7 +309,7 @@ xf86ModulelistFromConfig(pointer **optlist)
             }
             if (found == FALSE) {
 		XF86LoadPtr ptr = (XF86LoadPtr)xf86configptr->conf_modules;
-	            ptr = xf86addNewLoadDirective(ptr, ModuleDefaults[i].name, XF86_LOAD_MODULE, ModuleDefaults[i].load_opt);
+                xf86addNewLoadDirective(ptr, ModuleDefaults[i].name, XF86_LOAD_MODULE, ModuleDefaults[i].load_opt);
                 xf86Msg(X_INFO, "\"%s\" will be loaded by default.\n", ModuleDefaults[i].name);
             }
          }
@@ -318,7 +318,7 @@ xf86ModulelistFromConfig(pointer **optlist)
 	for (i=0 ; ModuleDefaults[i].name != NULL ; i++) {
 	    if (ModuleDefaults[i].toLoad == TRUE) {
 		XF86LoadPtr ptr = (XF86LoadPtr)xf86configptr->conf_modules;
-		ptr = xf86addNewLoadDirective(ptr, ModuleDefaults[i].name, XF86_LOAD_MODULE, ModuleDefaults[i].load_opt);
+		xf86addNewLoadDirective(ptr, ModuleDefaults[i].name, XF86_LOAD_MODULE, ModuleDefaults[i].load_opt);
 	    }
 	}
     }
@@ -1459,8 +1459,9 @@ configInputDevices(XF86ConfLayoutPtr layout, serverLayoutPtr servlayoutp)
     while (irp) {
 	indp[count] = xf86AllocateInput();
 	if (!configInput(indp[count], irp->iref_inputdev, X_CONFIG)) {
-	    while(count--)
+	    do {
 		free(indp[count]);
+	    } while(count--);
 	    free(indp);
 	    return FALSE;
 	}
@@ -1485,7 +1486,7 @@ configLayout(serverLayoutPtr servlayoutp, XF86ConfLayoutPtr conf_layout,
 {
     XF86ConfAdjacencyPtr adjp;
     XF86ConfInactivePtr idp;
-    int count = 0;
+    int saved_count, count = 0;
     int scrnum;
     XF86ConfLayoutPtr l;
     MessageType from;
@@ -1553,6 +1554,9 @@ configLayout(serverLayoutPtr servlayoutp, XF86ConfLayoutPtr conf_layout,
 	    scrnum = adjp->adj_scrnum;
 	if (!configScreen(slp[count].screen, adjp->adj_screen, scrnum,
 			  X_CONFIG)) {
+	    do {
+		free(slp[count].screen);
+	    } while(count--);
 	    free(slp);
 	    return FALSE;
 	}
@@ -1641,6 +1645,10 @@ configLayout(serverLayoutPtr servlayoutp, XF86ConfLayoutPtr conf_layout,
 	}
     }
 
+    if (!count)
+	saved_count = 1;
+    else
+	saved_count = count;
     /*
      * Count the number of inactive devices.
      */
@@ -1657,16 +1665,14 @@ configLayout(serverLayoutPtr servlayoutp, XF86ConfLayoutPtr conf_layout,
     idp = conf_layout->lay_inactive_lst;
     count = 0;
     while (idp) {
-	if (!configDevice(&gdp[count], idp->inactive_device, FALSE)) {
-	    free(gdp);
-	    return FALSE;
-	}
+	if (!configDevice(&gdp[count], idp->inactive_device, FALSE))
+	    goto bail;
         count++;
         idp = (XF86ConfInactivePtr)idp->list.next;
     }
 
     if (!configInputDevices(conf_layout, servlayoutp))
-	return FALSE;
+	goto bail;
 
     servlayoutp->id = conf_layout->lay_identifier;
     servlayoutp->screens = slp;
@@ -1675,6 +1681,14 @@ configLayout(serverLayoutPtr servlayoutp, XF86ConfLayoutPtr conf_layout,
     from = X_DEFAULT;
 
     return TRUE;
+
+bail:
+    do {
+	free(slp[saved_count].screen);
+    } while(saved_count--);
+    free(slp);
+    free(gdp);
+    return FALSE;
 }
 
 /*
diff --git a/xorg-server/hw/xfree86/common/xf86Helper.c b/xorg-server/hw/xfree86/common/xf86Helper.c
index 399883886..3cdffdb43 100644
--- a/xorg-server/hw/xfree86/common/xf86Helper.c
+++ b/xorg-server/hw/xfree86/common/xf86Helper.c
@@ -1831,6 +1831,7 @@ xf86ConfigFbEntity(ScrnInfoPtr pScrn, int scrnFlag, int entityIndex,
 
     xf86SetEntityFuncs(entityIndex,init,enter,leave,private);
 
+    free(pEnt);
     return pScrn;
 }
 
diff --git a/xorg-server/hw/xfree86/common/xf86Init.c b/xorg-server/hw/xfree86/common/xf86Init.c
index e017d9dce..0b36163c0 100644
--- a/xorg-server/hw/xfree86/common/xf86Init.c
+++ b/xorg-server/hw/xfree86/common/xf86Init.c
@@ -1,1497 +1,1499 @@
-/*

- * Loosely based on code bearing the following copyright:

- *

- *   Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.

- */

-/*

- * Copyright (c) 1992-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 <stdlib.h>

-#include <errno.h>

-

-#undef HAS_UTSNAME

-#if !defined(WIN32)

-#define HAS_UTSNAME 1

-#include <sys/utsname.h>

-#endif

-

-#include <X11/X.h>

-#include <X11/Xmd.h>

-#include <X11/Xproto.h>

-#include <X11/Xatom.h>

-#include "input.h"

-#include "servermd.h"

-#include "windowstr.h"

-#include "scrnintstr.h"

-#include "site.h"

-#include "mi.h"

-

-#include "compiler.h"

-

-#include "loaderProcs.h"

-#ifdef XFreeXDGA

-#include "dgaproc.h"

-#endif

-

-#define XF86_OS_PRIVS

-#include "xf86.h"

-#include "xf86Priv.h"

-#include "xf86Config.h"

-#include "xf86_OSlib.h"

-#include "xf86cmap.h"

-#include "xorgVersion.h"

-#include "xf86Build.h"

-#include "mipointer.h"

-#include <X11/extensions/XI.h>

-#include <X11/extensions/XIproto.h>

-#include "xf86DDC.h"

-#include "xf86Xinput.h"

-#include "xf86InPriv.h"

-#include "picturestr.h"

-

-#include "xf86Bus.h"

-#include "xf86VGAarbiter.h"

-#include "globals.h"

-

-#ifdef DPMSExtension

-#include <X11/extensions/dpmsconst.h>

-#include "dpmsproc.h"

-#endif

-#include <hotplug.h>

-

-

-#ifdef XF86PM

-void (*xf86OSPMClose)(void) = NULL;

-#endif

-static Bool xorgHWOpenConsole = FALSE;

-

-/* Common pixmap formats */

-

-static PixmapFormatRec formats[MAXFORMATS] = {

-	{ 1,	1,	BITMAP_SCANLINE_PAD },

-	{ 4,	8,	BITMAP_SCANLINE_PAD },

-	{ 8,	8,	BITMAP_SCANLINE_PAD },

-	{ 15,	16,	BITMAP_SCANLINE_PAD },

-	{ 16,	16,	BITMAP_SCANLINE_PAD },

-	{ 24,	32,	BITMAP_SCANLINE_PAD },

-	{ 32,	32,	BITMAP_SCANLINE_PAD },

-};

-static int numFormats = 7;

-static Bool formatsDone = FALSE;

-

-#ifndef OSNAME

-#define OSNAME " unknown"

-#endif

-#ifndef OSVENDOR

-#define OSVENDOR ""

-#endif

-#ifndef PRE_RELEASE

-#define PRE_RELEASE XORG_VERSION_SNAP

-#endif

-

-static void

-xf86PrintBanner(void)

-{

-#if PRE_RELEASE

-  xf86ErrorFVerb(0, "\n"

-    "This is a pre-release version of the X server from " XVENDORNAME ".\n"

-    "It is not supported in any way.\n"

-    "Bugs may be filed in the bugzilla at http://bugs.freedesktop.org/.\n"

-    "Select the \"xorg\" product for bugs you find in this release.\n"

-    "Before reporting bugs in pre-release versions please check the\n"

-    "latest version in the X.Org Foundation git repository.\n"

-    "See http://wiki.x.org/wiki/GitPage for git access instructions.\n");

-#endif

-  xf86ErrorFVerb(0, "\nX.Org X Server %d.%d.%d",

-	 XORG_VERSION_MAJOR,

-	 XORG_VERSION_MINOR,

-	 XORG_VERSION_PATCH);

-#if XORG_VERSION_SNAP > 0

-  xf86ErrorFVerb(0, ".%d", XORG_VERSION_SNAP);

-#endif

-

-#if XORG_VERSION_SNAP >= 900

-  /* When the minor number is 99, that signifies that the we are making

-   * a release candidate for a major version.  (X.0.0)

-   * When the patch number is 99, that signifies that the we are making

-   * a release candidate for a minor version.  (X.Y.0)

-   * When the patch number is < 99, then we are making a release

-   * candidate for the next point release.  (X.Y.Z)

-   */

-#if XORG_VERSION_MINOR >= 99

-  xf86ErrorFVerb(0, " (%d.0.0 RC %d)", XORG_VERSION_MAJOR+1,

-                 XORG_VERSION_SNAP - 900);

-#elif XORG_VERSION_PATCH == 99

-  xf86ErrorFVerb(0, " (%d.%d.0 RC %d)", XORG_VERSION_MAJOR,

-                 XORG_VERSION_MINOR + 1, XORG_VERSION_SNAP - 900);

-#else

-  xf86ErrorFVerb(0, " (%d.%d.%d RC %d)", XORG_VERSION_MAJOR,

-                 XORG_VERSION_MINOR, XORG_VERSION_PATCH + 1,

-                 XORG_VERSION_SNAP - 900);

-#endif

-#endif

-

-#ifdef XORG_CUSTOM_VERSION

-  xf86ErrorFVerb(0, " (%s)", XORG_CUSTOM_VERSION);

-#endif

-#ifndef XORG_DATE

-# define XORG_DATE "Unknown"

-#endif

-  xf86ErrorFVerb(0, "\nRelease Date: %s\n", XORG_DATE);

-  xf86ErrorFVerb(0, "X Protocol Version %d, Revision %d\n",

-         X_PROTOCOL, X_PROTOCOL_REVISION);

-  xf86ErrorFVerb(0, "Build Operating System: %s %s\n", OSNAME, OSVENDOR);

-#ifdef HAS_UTSNAME

-  {

-    struct utsname name;

-

-    /* Linux & BSD state that 0 is success, SysV (including Solaris, HP-UX,

-       and Irix) and Single Unix Spec 3 just say that non-negative is success.

-       All agree that failure is represented by a negative number.

-     */

-    if (uname(&name) >= 0) {

-      xf86ErrorFVerb(0, "Current Operating System: %s %s %s %s %s\n",

-	name.sysname, name.nodename, name.release, name.version, name.machine);

-#ifdef linux

-      do {

-	  char buf[80];

-	  int fd = open("/proc/cmdline", O_RDONLY);

-	  if (fd != -1) {

-	    xf86ErrorFVerb(0, "Kernel command line: ");

-	    memset(buf, 0, 80);

-	    while (read(fd, buf, 80) > 0) {

-		xf86ErrorFVerb(0, "%.80s", buf);

-		memset(buf, 0, 80);

-	    }

-	    close(fd);

-	  } 

-      } while (0);

-#endif

-    }

-  }

-#endif

-#if defined(BUILD_DATE) && (BUILD_DATE > 19000000)

-  {

-    struct tm t;

-    char buf[100];

-

-    memset(&t, 0, sizeof(t));

-    memset(buf, 0, sizeof(buf));

-    t.tm_mday = BUILD_DATE % 100;

-    t.tm_mon = (BUILD_DATE / 100) % 100 - 1;

-    t.tm_year = BUILD_DATE / 10000 - 1900;

-#if defined(BUILD_TIME)

-    t.tm_sec = BUILD_TIME % 100;

-    t.tm_min = (BUILD_TIME / 100) % 100;

-    t.tm_hour = (BUILD_TIME / 10000) % 100;

-    if (strftime(buf, sizeof(buf), "%d %B %Y  %I:%M:%S%p", &t))

-       xf86ErrorFVerb(0, "Build Date: %s\n", buf);

-#else

-    if (strftime(buf, sizeof(buf), "%d %B %Y", &t))

-       xf86ErrorFVerb(0, "Build Date: %s\n", buf);

-#endif

-  }

-#endif

-#if defined(BUILDERSTRING)

-  xf86ErrorFVerb(0, "%s \n", BUILDERSTRING);

-#endif

-  xf86ErrorFVerb(0, "Current version of pixman: %s\n",

-                 pixman_version_string());

-  xf86ErrorFVerb(0, "\tBefore reporting problems, check "

-                 ""__VENDORDWEBSUPPORT__"\n"

-                 "\tto make sure that you have the latest version.\n");

-}

-

-static void

-xf86PrintMarkers(void)

-{

-  LogPrintMarkers();

-}

-

-static Bool

-xf86CreateRootWindow(WindowPtr pWin)

-{

-  int ret = TRUE;

-  int err = Success;

-  ScreenPtr pScreen = pWin->drawable.pScreen;

-  RootWinPropPtr pProp;

-  CreateWindowProcPtr CreateWindow = (CreateWindowProcPtr)

-      dixLookupPrivate(&pScreen->devPrivates, xf86CreateRootWindowKey);

-

-  DebugF("xf86CreateRootWindow(%p)\n", pWin);

-

-  if ( pScreen->CreateWindow != xf86CreateRootWindow ) {

-    /* Can't find hook we are hung on */

-	xf86DrvMsg(pScreen->myNum, X_WARNING /* X_ERROR */,

-		  "xf86CreateRootWindow %p called when not in pScreen->CreateWindow %p n",

-		   (void *)xf86CreateRootWindow,

-		   (void *)pScreen->CreateWindow );

-  }

-

-  /* Unhook this function ... */

-  pScreen->CreateWindow = CreateWindow;

-  dixSetPrivate(&pScreen->devPrivates, xf86CreateRootWindowKey, NULL);

-

-  /* ... and call the previous CreateWindow fuction, if any */

-  if (NULL!=pScreen->CreateWindow) {

-    ret = (*pScreen->CreateWindow)(pWin);

-  }

-

-  /* Now do our stuff */

-  if (xf86RegisteredPropertiesTable != NULL) {

-    if (pWin->parent == NULL && xf86RegisteredPropertiesTable != NULL) {

-      for (pProp = xf86RegisteredPropertiesTable[pScreen->myNum];

-	   pProp != NULL && err==Success;

-	   pProp = pProp->next )

-	{

-	  Atom prop;

-

-	  prop = MakeAtom(pProp->name, strlen(pProp->name), TRUE);

-	  err = dixChangeWindowProperty(serverClient, pWin,

-					prop, pProp->type,

-					pProp->format, PropModeReplace,

-					pProp->size, pProp->data,

-					FALSE);

-	}

-

-      /* Look at err */

-      ret &= (err==Success);

-

-    } else {

-      xf86Msg(X_ERROR, "xf86CreateRootWindow unexpectedly called with "

-	      "non-root window %p (parent %p)\n",

-	      (void *)pWin, (void *)pWin->parent);

-      ret = FALSE;

-    }

-  }

-

-  DebugF("xf86CreateRootWindow() returns %d\n", ret);

-  return ret;

-}

-

-

-static void

-InstallSignalHandlers(void)

-{

-    /*

-     * Install signal handler for unexpected signals

-     */

-    xf86Info.caughtSignal=FALSE;

-    if (!xf86Info.notrapSignals) {

-	OsRegisterSigWrapper(xf86SigWrapper);

-    } else {

-	signal(SIGSEGV, SIG_DFL);

-	signal(SIGILL, SIG_DFL);

-#ifdef SIGEMT

-	signal(SIGEMT, SIG_DFL);

-#endif

-	signal(SIGFPE, SIG_DFL);

-	signal(SIGBUS, SIG_DFL);

-	signal(SIGSYS, SIG_DFL);

-	signal(SIGXCPU, SIG_DFL);

-	signal(SIGXFSZ, SIG_DFL);

-    }

-}

-

-/*

- * InitOutput --

- *	Initialize screenInfo for all actually accessible framebuffers.

- *      That includes vt-manager setup, querying all possible devices and

- *      collecting the pixmap formats.

- */

-void

-InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)

-{

-  int                    i, j, k, scr_index, was_blocked = 0;

-  char                   **modulelist;

-  pointer                *optionlist;

-  Pix24Flags		 screenpix24, pix24;

-  MessageType		 pix24From = X_DEFAULT;

-  Bool			 pix24Fail = FALSE;

-  Bool			 autoconfig = FALSE;

-  GDevPtr		 configured_device;

-

-  xf86Initialising = TRUE;

-

-  if (serverGeneration == 1) {

-    if ((xf86ServerName = strrchr(argv[0], '/')) != 0)

-      xf86ServerName++;

-    else

-      xf86ServerName = argv[0];

-

-	xf86PrintBanner();

-	xf86PrintMarkers();

-	if (xf86LogFile)  {

-	    time_t t;

-	    const char *ct;

-	    t = time(NULL);

-	    ct = ctime(&t);

-	    xf86MsgVerb(xf86LogFileFrom, 0, "Log file: \"%s\", Time: %s",

-			xf86LogFile, ct);

-	}

-

-    /* Read and parse the config file */

-    if (!xf86DoConfigure && !xf86DoShowOptions) {

-      switch (xf86HandleConfigFile(FALSE)) {

-      case CONFIG_OK:

-	break;

-      case CONFIG_PARSE_ERROR:

-	xf86Msg(X_ERROR, "Error parsing the config file\n");

-	return;

-      case CONFIG_NOFILE:

-	autoconfig = TRUE;

-	break;

-      }

-    }

-

-    InstallSignalHandlers();

-

-    /* Initialise the loader */

-    LoaderInit();

-

-    /* Tell the loader the default module search path */

-    LoaderSetPath(xf86ModulePath);

-

-    if (xf86Info.ignoreABI) {

-        LoaderSetOptions(LDR_OPT_ABI_MISMATCH_NONFATAL);

-    }

-

-    if (xf86DoShowOptions)

-        DoShowOptions();

-

-    /* Do a general bus probe.  This will be a PCI probe for x86 platforms */

-    xf86BusProbe();

-

-    if (xf86DoConfigure)

-	DoConfigure();

-

-    if (autoconfig) {

-	if (!xf86AutoConfig()) {

-	    xf86Msg(X_ERROR, "Auto configuration failed\n");

-	    return;

-	}

-    }

-

-#ifdef XF86PM

-    xf86OSPMClose = xf86OSPMOpen();

-#endif

-

-    /* Load all modules specified explicitly in the config file */

-    if ((modulelist = xf86ModulelistFromConfig(&optionlist))) {

-      xf86LoadModules(modulelist, optionlist);

-      free(modulelist);

-      free(optionlist);

-    }

-

-    /* Load all driver modules specified in the config file */

-    /* If there aren't any specified in the config file, autoconfig them */

-    /* FIXME: Does not handle multiple active screen sections, but I'm not

-     * sure if we really want to handle that case*/

-    configured_device = xf86ConfigLayout.screens->screen->device;

-    if ((!configured_device) || (!configured_device->driver)) {

-        if (!autoConfigDevice(configured_device)) {

-            xf86Msg(X_ERROR, "Automatic driver configuration failed\n");

-            return ;

-        }

-    }

-    if ((modulelist = xf86DriverlistFromConfig())) {

-      xf86LoadModules(modulelist, NULL);

-      free(modulelist);

-    }

-

-    /* Load all input driver modules specified in the config file. */

-    if ((modulelist = xf86InputDriverlistFromConfig())) {

-      xf86LoadModules(modulelist, NULL);

-      free(modulelist);

-    }

-

-    /*

-     * It is expected that xf86AddDriver()/xf86AddInputDriver will be

-     * called for each driver as it is loaded.  Those functions save the

-     * module pointers for drivers.

-     * XXX Nothing keeps track of them for other modules.

-     */

-    /* XXX What do we do if not all of these could be loaded? */

-

-    /*

-     * At this point, xf86DriverList[] is all filled in with entries for

-     * each of the drivers to try and xf86NumDrivers has the number of

-     * drivers.  If there are none, return now.

-     */

-

-    if (xf86NumDrivers == 0) {

-      xf86Msg(X_ERROR, "No drivers available.\n");

-      return;

-    }

-

-    /*

-     * Call each of the Identify functions and call the driverFunc to check

-     * if HW access is required.  The Identify functions print out some

-     * identifying information, and anything else that might be

-     * needed at this early stage.

-     */

-

-    for (i = 0; i < xf86NumDrivers; i++) {

-	if (xf86DriverList[i]->Identify != NULL)

-	    xf86DriverList[i]->Identify(0);

-

-	if (!xorgHWAccess || !xorgHWOpenConsole) {

-	    xorgHWFlags flags;

-	    if(!xf86DriverList[i]->driverFunc

-		|| !xf86DriverList[i]->driverFunc(NULL,

-						  GET_REQUIRED_HW_INTERFACES,

-						  &flags))

-		flags = HW_IO;

-

-	    if(NEED_IO_ENABLED(flags))

-		xorgHWAccess = TRUE;

-	    if(!(flags & HW_SKIP_CONSOLE))

-		xorgHWOpenConsole = TRUE;

-	}

-    }

-

-    if (xorgHWOpenConsole)

-	xf86OpenConsole();

-    else

-	xf86Info.dontVTSwitch = TRUE;

-

-    if (xf86BusConfig() == FALSE)

-        return;

-

-    xf86PostProbe();

-

-    /*

-     * Sort the drivers to match the requested ording.  Using a slow

-     * bubble sort.

-     */

-    for (j = 0; j < xf86NumScreens - 1; j++) {

-	for (i = 0; i < xf86NumScreens - j - 1; i++) {

-	    if (xf86Screens[i + 1]->confScreen->screennum <

-		xf86Screens[i]->confScreen->screennum) {

-		ScrnInfoPtr tmpScrn = xf86Screens[i + 1];

-		xf86Screens[i + 1] = xf86Screens[i];

-		xf86Screens[i] = tmpScrn;

-	    }

-	}

-    }

-    /* Fix up the indexes */

-    for (i = 0; i < xf86NumScreens; i++) {

-	xf86Screens[i]->scrnIndex = i;

-    }

-

-    /*

-     * Call the driver's PreInit()'s to complete initialisation for the first

-     * generation.

-     */

-

-    for (i = 0; i < xf86NumScreens; i++) {

-	xf86VGAarbiterScrnInit(xf86Screens[i]);

-	xf86VGAarbiterLock(xf86Screens[i]);

-	if (xf86Screens[i]->PreInit &&

-	    xf86Screens[i]->PreInit(xf86Screens[i], 0))

-	    xf86Screens[i]->configured = TRUE;

-	xf86VGAarbiterUnlock(xf86Screens[i]);

-    }

-    for (i = 0; i < xf86NumScreens; i++)

-	if (!xf86Screens[i]->configured)

-	    xf86DeleteScreen(i--, 0);

-

-    /*

-     * If no screens left, return now.

-     */

-

-    if (xf86NumScreens == 0) {

-      xf86Msg(X_ERROR,

-	      "Screen(s) found, but none have a usable configuration.\n");

-      return;

-    }

-

-    for (i = 0; i < xf86NumScreens; i++) {

-      if (xf86Screens[i]->name == NULL) {

-	XNFasprintf(&xf86Screens[i]->name, "screen%d", i);

-	xf86MsgVerb(X_WARNING, 0,

-		    "Screen driver %d has no name set, using `%s'.\n",

-		    i, xf86Screens[i]->name);

-      }

-    }

-

-    /* Remove (unload) drivers that are not required */

-    for (i = 0; i < xf86NumDrivers; i++)

-	if (xf86DriverList[i] && xf86DriverList[i]->refCount <= 0)

-	    xf86DeleteDriver(i);

-

-    /*

-     * At this stage we know how many screens there are.

-     */

-

-    for (i = 0; i < xf86NumScreens; i++)

-      xf86InitViewport(xf86Screens[i]);

-

-    /*

-     * Collect all pixmap formats and check for conflicts at the display

-     * level.  Should we die here?  Or just delete the offending screens?

-     */

-    screenpix24 = Pix24DontCare;

-    for (i = 0; i < xf86NumScreens; i++) {

-	if (xf86Screens[i]->imageByteOrder !=

-	    xf86Screens[0]->imageByteOrder)

-	    FatalError("Inconsistent display bitmapBitOrder.  Exiting\n");

-	if (xf86Screens[i]->bitmapScanlinePad !=

-	    xf86Screens[0]->bitmapScanlinePad)

-	    FatalError("Inconsistent display bitmapScanlinePad.  Exiting\n");

-	if (xf86Screens[i]->bitmapScanlineUnit !=

-	    xf86Screens[0]->bitmapScanlineUnit)

-	    FatalError("Inconsistent display bitmapScanlineUnit.  Exiting\n");

-	if (xf86Screens[i]->bitmapBitOrder !=

-	    xf86Screens[0]->bitmapBitOrder)

-	    FatalError("Inconsistent display bitmapBitOrder.  Exiting\n");

-

-	/* Determine the depth 24 pixmap format the screens would like */

-	if (xf86Screens[i]->pixmap24 != Pix24DontCare) {

-	    if (screenpix24 == Pix24DontCare)

-		screenpix24 = xf86Screens[i]->pixmap24;

-	    else if (screenpix24 != xf86Screens[i]->pixmap24)

-		FatalError("Inconsistent depth 24 pixmap format.  Exiting\n");

-	}

-    }

-    /* check if screenpix24 is consistent with the config/cmdline */

-    if (xf86Info.pixmap24 != Pix24DontCare) {

-	pix24 = xf86Info.pixmap24;

-	pix24From = xf86Info.pix24From;

-	if (screenpix24 != Pix24DontCare && screenpix24 != xf86Info.pixmap24)

-	    pix24Fail = TRUE;

-    } else if (screenpix24 != Pix24DontCare) {

-	pix24 = screenpix24;

-	pix24From = X_PROBED;

-    } else

-	pix24 = Pix24Use32;

-

-    if (pix24Fail)

-	FatalError("Screen(s) can't use the required depth 24 pixmap format"

-		   " (%d).  Exiting\n", PIX24TOBPP(pix24));

-

-    /* Initialise the depth 24 format */

-    for (j = 0; j < numFormats && formats[j].depth != 24; j++)

-	;

-    formats[j].bitsPerPixel = PIX24TOBPP(pix24);

-

-    /* Collect additional formats */

-    for (i = 0; i < xf86NumScreens; i++) {

-	for (j = 0; j < xf86Screens[i]->numFormats; j++) {

-	    for (k = 0; ; k++) {

-		if (k >= numFormats) {

-		    if (k >= MAXFORMATS)

-			FatalError("Too many pixmap formats!  Exiting\n");

-		    formats[k] = xf86Screens[i]->formats[j];

-		    numFormats++;

-		    break;

-		}

-		if (formats[k].depth == xf86Screens[i]->formats[j].depth) {

-		    if ((formats[k].bitsPerPixel ==

-			 xf86Screens[i]->formats[j].bitsPerPixel) &&

-		        (formats[k].scanlinePad ==

-			 xf86Screens[i]->formats[j].scanlinePad))

-			break;

-		    FatalError("Inconsistent pixmap format for depth %d."

-			       "  Exiting\n", formats[k].depth);

-		}

-	    }

-	}

-    }

-    formatsDone = TRUE;

-

-    if (xf86Info.vtno >= 0 ) {

-#define VT_ATOM_NAME         "XFree86_VT"

-      Atom VTAtom=-1;

-      CARD32  *VT = NULL;

-      int  ret;

-

-      /* This memory needs to stay available until the screen has been

-	 initialized, and we can create the property for real.

-      */

-      if ( (VT = malloc(sizeof(CARD32)))==NULL ) {

-	FatalError("Unable to make VT property - out of memory. Exiting...\n");

-      }

-      *VT = xf86Info.vtno;

-

-      VTAtom = MakeAtom(VT_ATOM_NAME, sizeof(VT_ATOM_NAME) - 1, TRUE);

-

-      for (i = 0, ret = Success; i < xf86NumScreens && ret == Success; i++) {

-	ret = xf86RegisterRootWindowProperty(xf86Screens[i]->scrnIndex,

-					     VTAtom, XA_INTEGER, 32,

-					     1, VT );

-	if (ret != Success)

-	  xf86DrvMsg(xf86Screens[i]->scrnIndex, X_WARNING,

-		     "Failed to register VT property\n");

-      }

-    }

-

-    /* If a screen uses depth 24, show what the pixmap format is */

-    for (i = 0; i < xf86NumScreens; i++) {

-	if (xf86Screens[i]->depth == 24) {

-	    xf86Msg(pix24From, "Depth 24 pixmap format is %d bpp\n",

-		    PIX24TOBPP(pix24));

-	    break;

-	}

-    }

-  } else {

-    /*

-     * serverGeneration != 1; some OSs have to do things here, too.

-     */

-    if (xorgHWOpenConsole)

-	xf86OpenConsole();

-

-#ifdef XF86PM

-    /*

-      should we reopen it here? We need to deal with an already opened

-      device. We could leave this to the OS layer. For now we simply

-      close it here

-    */

-    if (xf86OSPMClose)

-        xf86OSPMClose();

-    if ((xf86OSPMClose = xf86OSPMOpen()) != NULL)

-	xf86MsgVerb(X_INFO, 3, "APM registered successfully\n");

-#endif

-

-    /* Make sure full I/O access is enabled */

-    if (xorgHWAccess)

-	xf86EnableIO();

-  }

-

-  /*

-   * Use the previously collected parts to setup pScreenInfo

-   */

-

-  pScreenInfo->imageByteOrder = xf86Screens[0]->imageByteOrder;

-  pScreenInfo->bitmapScanlinePad = xf86Screens[0]->bitmapScanlinePad;

-  pScreenInfo->bitmapScanlineUnit = xf86Screens[0]->bitmapScanlineUnit;

-  pScreenInfo->bitmapBitOrder = xf86Screens[0]->bitmapBitOrder;

-  pScreenInfo->numPixmapFormats = numFormats;

-  for (i = 0; i < numFormats; i++)

-    pScreenInfo->formats[i] = formats[i];

-

-  /* Make sure the server's VT is active */

-

-  if (serverGeneration != 1) {

-    xf86Resetting = TRUE;

-    /* All screens are in the same state, so just check the first */

-    if (!xf86Screens[0]->vtSema) {

-#ifdef HAS_USL_VTS

-      ioctl(xf86Info.consoleFd, VT_RELDISP, VT_ACKACQ);

-#endif

-      xf86AccessEnter();

-      was_blocked = xf86BlockSIGIO();

-    }

-  }

-

-  for (i = 0; i < xf86NumScreens; i++)

-      if (!xf86ColormapAllocatePrivates(xf86Screens[i]))

-	  FatalError("Cannot register DDX private keys");

-

-  if (!dixRegisterPrivateKey(&xf86ScreenKeyRec, PRIVATE_SCREEN, 0) ||

-      !dixRegisterPrivateKey(&xf86CreateRootWindowKeyRec, PRIVATE_SCREEN, 0))

-      FatalError("Cannot register DDX private keys");

-

-  for (i = 0; i < xf86NumScreens; i++) {

-	xf86VGAarbiterLock(xf86Screens[i]);

-	/*

-	 * Almost everything uses these defaults, and many of those that

-	 * don't, will wrap them.

-	 */

-	xf86Screens[i]->EnableDisableFBAccess = xf86EnableDisableFBAccess;

-#ifdef XFreeXDGA

-	xf86Screens[i]->SetDGAMode = xf86SetDGAMode;

-#endif

-	xf86Screens[i]->DPMSSet = NULL;

-	xf86Screens[i]->LoadPalette = NULL;

-	xf86Screens[i]->SetOverscan = NULL;

-	xf86Screens[i]->DriverFunc = NULL;

-	xf86Screens[i]->pScreen = NULL;

-	scr_index = AddScreen(xf86Screens[i]->ScreenInit, argc, argv);

-	xf86VGAarbiterUnlock(xf86Screens[i]);

-      if (scr_index == i) {

-	/*

-	 * Hook in our ScrnInfoRec, and initialise some other pScreen

-	 * fields.

-	 */

-	dixSetPrivate(&screenInfo.screens[scr_index]->devPrivates,

-		      xf86ScreenKey, xf86Screens[i]);

-	xf86Screens[i]->pScreen = screenInfo.screens[scr_index];

-	/* The driver should set this, but make sure it is set anyway */

-	xf86Screens[i]->vtSema = TRUE;

-      } else {

-	/* This shouldn't normally happen */

-	FatalError("AddScreen/ScreenInit failed for driver %d\n", i);

-      }

-

-      DebugF("InitOutput - xf86Screens[%d]->pScreen = %p\n",

-	     i, xf86Screens[i]->pScreen );

-      DebugF("xf86Screens[%d]->pScreen->CreateWindow = %p\n",

-	     i, xf86Screens[i]->pScreen->CreateWindow );

-

-      dixSetPrivate(&screenInfo.screens[scr_index]->devPrivates,

-		    xf86CreateRootWindowKey,

-		    xf86Screens[i]->pScreen->CreateWindow);

-      xf86Screens[i]->pScreen->CreateWindow = xf86CreateRootWindow;

-

-    if (PictureGetSubpixelOrder (xf86Screens[i]->pScreen) == SubPixelUnknown)

-    {

-	xf86MonPtr DDC = (xf86MonPtr)(xf86Screens[i]->monitor->DDC);

-	PictureSetSubpixelOrder (xf86Screens[i]->pScreen,

-				 DDC ?

-				 (DDC->features.input_type ?

-				  SubPixelHorizontalRGB : SubPixelNone) :

-				 SubPixelUnknown);

-    }

-#ifdef RANDR

-    if (!xf86Info.disableRandR)

-	xf86RandRInit (screenInfo.screens[scr_index]);

-    xf86Msg(xf86Info.randRFrom, "RandR %s\n",

-	    xf86Info.disableRandR ? "disabled" : "enabled");

-#endif

-  }

-

-  xf86VGAarbiterWrapFunctions();

-  xf86UnblockSIGIO(was_blocked);

-

-  xf86InitOrigins();

-

-  xf86Resetting = FALSE;

-  xf86Initialising = FALSE;

-

-  RegisterBlockAndWakeupHandlers((BlockHandlerProcPtr)NoopDDA, xf86Wakeup,

-				 NULL);

-}

-

-/*

- * InitInput --

- *      Initialize all supported input devices.

- */

-

-void

-InitInput(int argc, char **argv)

-{

-    InputInfoPtr* pDev;

-    DeviceIntPtr dev;

-

-    xf86Info.vtRequestsPending = FALSE;

-

-    mieqInit();

-

-    GetEventList(&xf86Events);

-

-    /* Initialize all configured input devices */

-    for (pDev = xf86ConfigLayout.inputs; pDev && *pDev; pDev++) {

-        /* Replace obsolete keyboard driver with kbd */

-        if (!xf86NameCmp((*pDev)->driver, "keyboard")) {

-            strcpy((*pDev)->driver, "kbd");

-        }

-

-        /* If one fails, the others will too */

-        if (xf86NewInputDevice(*pDev, &dev, TRUE) == BadAlloc)

-            break;

-    }

-

-    config_init();

-}

-

-void

-CloseInput (void)

-{

-    config_fini();

-}

-

-/*

- * OsVendorInit --

- *      OS/Vendor-specific initialisations.  Called from OsInit(), which

- *      is called by dix before establishing the well known sockets.

- */

-

-void

-OsVendorInit(void)

-{

-  static Bool beenHere = FALSE;

-

-  signal(SIGCHLD, SIG_DFL);	/* Need to wait for child processes */

-

-  if (!beenHere) {

-    umask(022);

-    xf86LogInit();

-  }

-

-        /* Set stderr to non-blocking. */

-#ifndef O_NONBLOCK

-#if defined(FNDELAY)

-#define O_NONBLOCK FNDELAY

-#elif defined(O_NDELAY)

-#define O_NONBLOCK O_NDELAY

-#endif

-

-#ifdef O_NONBLOCK

-  if (!beenHere) {

-    if (geteuid() == 0 && getuid() != geteuid())

-    {

-      int status;

-

-      status = fcntl(fileno(stderr), F_GETFL, 0);

-      if (status != -1) {

-	fcntl(fileno(stderr), F_SETFL, status | O_NONBLOCK);

-      }

-    }

-  }

-#endif

-#endif

-

-  beenHere = TRUE;

-}

-

-/*

- * ddxGiveUp --

- *      Device dependent cleanup. Called by by dix before normal server death.

- *      For SYSV386 we must switch the terminal back to normal mode. No error-

- *      checking here, since there should be restored as much as possible.

- */

-

-void

-ddxGiveUp(void)

-{

-    int i;

-

-    xf86VGAarbiterFini();

-

-#ifdef XF86PM

-    if (xf86OSPMClose)

-	xf86OSPMClose();

-    xf86OSPMClose = NULL;

-#endif

-

-    for (i = 0; i < xf86NumScreens; i++) {

-	/*

-	 * zero all access functions to

-	 * trap calls when switched away.

-	 */

-	xf86Screens[i]->vtSema = FALSE;

-    }

-

-#ifdef XFreeXDGA

-    DGAShutdown();

-#endif

-

-    if (xorgHWOpenConsole)

-	xf86CloseConsole();

-

-    xf86CloseLog();

-

-    /* If an unexpected signal was caught, dump a core for debugging */

-    if (xf86Info.caughtSignal)

-	OsAbort();

-}

-

-

-

-/*

- * AbortDDX --

- *      DDX - specific abort routine.  Called by AbortServer(). The attempt is

- *      made to restore all original setting of the displays. Also all devices

- *      are closed.

- */

-

-void

-AbortDDX(void)

-{

-  int i;

-

-  xf86BlockSIGIO();

-

-  /*

-   * try to restore the original video state

-   */

-#ifdef DPMSExtension /* Turn screens back on */

-  if (DPMSPowerLevel != DPMSModeOn)

-      DPMSSet(serverClient, DPMSModeOn);

-#endif

-  if (xf86Screens) {

-      for (i = 0; i < xf86NumScreens; i++)

-	  if (xf86Screens[i]->vtSema) {

-	      /*

-	       * if we are aborting before ScreenInit() has finished

-	       * we might not have been wrapped yet. Therefore enable

-	       * screen explicitely.

-	       */

-	      xf86VGAarbiterLock(xf86Screens[i]);

-	      (xf86Screens[i]->LeaveVT)(i, 0);

-	      xf86VGAarbiterUnlock(xf86Screens[i]);

-	  }

-  }

-

-  xf86AccessLeave();

-

-  /*

-   * This is needed for an abnormal server exit, since the normal exit stuff

-   * MUST also be performed (i.e. the vt must be left in a defined state)

-   */

-  ddxGiveUp();

-}

-

-void

-OsVendorFatalError(void)

-{

-#ifdef VENDORSUPPORT

-    ErrorF("\nPlease refer to your Operating System Vendor support pages\n"

-	   "at %s for support on this crash.\n",VENDORSUPPORT);

-#else

-    ErrorF("\nPlease consult the "XVENDORNAME" support \n"

-	   "\t at "__VENDORDWEBSUPPORT__"\n for help. \n");

-#endif

-    if (xf86LogFile && xf86LogFileWasOpened)

-	ErrorF("Please also check the log file at \"%s\" for additional "

-              "information.\n", xf86LogFile);

-    ErrorF("\n");

-}

-

-int

-xf86SetVerbosity(int verb)

-{

-    int save = xf86Verbose;

-

-    xf86Verbose = verb;

-    LogSetParameter(XLOG_VERBOSITY, verb);

-    return save;

-}

-

-int

-xf86SetLogVerbosity(int verb)

-{

-    int save = xf86LogVerbose;

-

-    xf86LogVerbose = verb;

-    LogSetParameter(XLOG_FILE_VERBOSITY, verb);

-    return save;

-}

-

-static void

-xf86PrintDefaultModulePath(void)

-{

-  ErrorF("%s\n", DEFAULT_MODULE_PATH);

-}

-

-static void

-xf86PrintDefaultLibraryPath(void)

-{

-  ErrorF("%s\n", DEFAULT_LIBRARY_PATH);

-}

-

-/*

- * ddxProcessArgument --

- *	Process device-dependent command line args. Returns 0 if argument is

- *      not device dependent, otherwise Count of number of elements of argv

- *      that are part of a device dependent commandline option.

- *

- */

-

-/* ARGSUSED */

-int

-ddxProcessArgument(int argc, char **argv, int i)

-{

-#define CHECK_FOR_REQUIRED_ARGUMENT() \

-    if (((i + 1) >= argc) || (!argv[i + 1])) { 				\

-      ErrorF("Required argument to %s not specified\n", argv[i]); 	\

-      UseMsg(); 							\

-      FatalError("Required argument to %s not specified\n", argv[i]);	\

-    }

-

-  /* First the options that are only allowed for root */

-  if (!strcmp(argv[i], "-modulepath") || !strcmp(argv[i], "-logfile")) {

-    if ( (geteuid() == 0) && (getuid() != 0) ) {

-      FatalError("The '%s' option can only be used by root.\n", argv[i]);

-    }

-    else if (!strcmp(argv[i], "-modulepath"))

-    {

-      char *mp;

-      CHECK_FOR_REQUIRED_ARGUMENT();

-      mp = strdup(argv[i + 1]);

-      if (!mp)

-	FatalError("Can't allocate memory for ModulePath\n");

-      xf86ModulePath = mp;

-      xf86ModPathFrom = X_CMDLINE;

-      return 2;

-    }

-    else if (!strcmp(argv[i], "-logfile"))

-    {

-      char *lf;

-      CHECK_FOR_REQUIRED_ARGUMENT();

-      lf = strdup(argv[i + 1]);

-      if (!lf)

-	FatalError("Can't allocate memory for LogFile\n");

-      xf86LogFile = lf;

-      xf86LogFileFrom = X_CMDLINE;

-      return 2;

-    }

-  }

-  if (!strcmp(argv[i], "-config") || !strcmp(argv[i], "-xf86config"))

-  {

-    CHECK_FOR_REQUIRED_ARGUMENT();

-    if (getuid() != 0 && !xf86PathIsSafe(argv[i + 1])) {

-      FatalError("\nInvalid argument for %s\n"

-	  "\tFor non-root users, the file specified with %s must be\n"

-	  "\ta relative path and must not contain any \"..\" elements.\n"

-	  "\tUsing default "__XCONFIGFILE__" search path.\n\n",

-	  argv[i], argv[i]);

-    }

-    xf86ConfigFile = argv[i + 1];

-    return 2;

-  }

-  if (!strcmp(argv[i], "-configdir"))

-  {

-    CHECK_FOR_REQUIRED_ARGUMENT();

-    if (getuid() != 0 && !xf86PathIsSafe(argv[i + 1])) {

-      FatalError("\nInvalid argument for %s\n"

-	  "\tFor non-root users, the file specified with %s must be\n"

-	  "\ta relative path and must not contain any \"..\" elements.\n"

-	  "\tUsing default "__XCONFIGDIR__" search path.\n\n",

-	  argv[i], argv[i]);

-    }

-    xf86ConfigDir = argv[i + 1];

-    return 2;

-  }

-  if (!strcmp(argv[i],"-flipPixels"))

-  {

-    xf86FlipPixels = TRUE;

-    return 1;

-  }

-#ifdef XF86VIDMODE

-  if (!strcmp(argv[i],"-disableVidMode"))

-  {

-    xf86VidModeDisabled = TRUE;

-    return 1;

-  }

-  if (!strcmp(argv[i],"-allowNonLocalXvidtune"))

-  {

-    xf86VidModeAllowNonLocal = TRUE;

-    return 1;

-  }

-#endif

-  if (!strcmp(argv[i],"-allowMouseOpenFail"))

-  {

-    xf86AllowMouseOpenFail = TRUE;

-    return 1;

-  }

-  if (!strcmp(argv[i],"-ignoreABI"))

-  {

-    LoaderSetOptions(LDR_OPT_ABI_MISMATCH_NONFATAL);

-    return 1;

-  }

-  if (!strcmp(argv[i],"-verbose"))

-  {

-    if (++i < argc && argv[i])

-    {

-      char *end;

-      long val;

-      val = strtol(argv[i], &end, 0);

-      if (*end == '\0')

-      {

-	xf86SetVerbosity(val);

-	return 2;

-      }

-    }

-    xf86SetVerbosity(++xf86Verbose);

-    return 1;

-  }

-  if (!strcmp(argv[i],"-logverbose"))

-  {

-    if (++i < argc && argv[i])

-    {

-      char *end;

-      long val;

-      val = strtol(argv[i], &end, 0);

-      if (*end == '\0')

-      {

-	xf86SetLogVerbosity(val);

-	return 2;

-      }

-    }

-    xf86SetLogVerbosity(++xf86LogVerbose);

-    return 1;

-  }

-  if (!strcmp(argv[i],"-quiet"))

-  {

-    xf86SetVerbosity(-1);

-    return 1;

-  }

-  if (!strcmp(argv[i],"-showconfig") || !strcmp(argv[i],"-version"))

-  {

-    xf86PrintBanner();

-    exit(0);

-  }

-  if (!strcmp(argv[i],"-showDefaultModulePath"))

-  {

-    xf86PrintDefaultModulePath();

-    exit(0);

-  }

-  if (!strcmp(argv[i],"-showDefaultLibPath"))

-  {

-    xf86PrintDefaultLibraryPath();

-    exit(0);

-  }

-  /* Notice the -fp flag, but allow it to pass to the dix layer */

-  if (!strcmp(argv[i], "-fp"))

-  {

-    xf86fpFlag = TRUE;

-    return 0;

-  }

-  /* Notice the -bs flag, but allow it to pass to the dix layer */

-  if (!strcmp(argv[i], "-bs"))

-  {

-    xf86bsDisableFlag = TRUE;

-    return 0;

-  }

-  /* Notice the +bs flag, but allow it to pass to the dix layer */

-  if (!strcmp(argv[i], "+bs"))

-  {

-    xf86bsEnableFlag = TRUE;

-    return 0;

-  }

-  /* Notice the -s flag, but allow it to pass to the dix layer */

-  if (!strcmp(argv[i], "-s"))

-  {

-    xf86sFlag = TRUE;

-    return 0;

-  }

-  if (!strcmp(argv[i], "-pixmap24"))

-  {

-    xf86Pix24 = Pix24Use24;

-    return 1;

-  }

-  if (!strcmp(argv[i], "-pixmap32"))

-  {

-    xf86Pix24 = Pix24Use32;

-    return 1;

-  }

-  if (!strcmp(argv[i], "-fbbpp"))

-  {

-    int bpp;

-    CHECK_FOR_REQUIRED_ARGUMENT();

-    if (sscanf(argv[++i], "%d", &bpp) == 1)

-    {

-      xf86FbBpp = bpp;

-      return 2;

-    }

-    else

-    {

-      ErrorF("Invalid fbbpp\n");

-      return 0;

-    }

-  }

-  if (!strcmp(argv[i], "-depth"))

-  {

-    int depth;

-    CHECK_FOR_REQUIRED_ARGUMENT();

-    if (sscanf(argv[++i], "%d", &depth) == 1)

-    {

-      xf86Depth = depth;

-      return 2;

-    }

-    else

-    {

-      ErrorF("Invalid depth\n");

-      return 0;

-    }

-  }

-  if (!strcmp(argv[i], "-weight"))

-  {

-    int red, green, blue;

-    CHECK_FOR_REQUIRED_ARGUMENT();

-    if (sscanf(argv[++i], "%1d%1d%1d", &red, &green, &blue) == 3)

-    {

-      xf86Weight.red = red;

-      xf86Weight.green = green;

-      xf86Weight.blue = blue;

-      return 2;

-    }

-    else

-    {

-      ErrorF("Invalid weighting\n");

-      return 0;

-    }

-  }

-  if (!strcmp(argv[i], "-gamma")  || !strcmp(argv[i], "-rgamma") ||

-      !strcmp(argv[i], "-ggamma") || !strcmp(argv[i], "-bgamma"))

-  {

-    double gamma;

-    CHECK_FOR_REQUIRED_ARGUMENT();

-    if (sscanf(argv[++i], "%lf", &gamma) == 1) {

-       if (gamma < GAMMA_MIN || gamma > GAMMA_MAX) {

-	  ErrorF("gamma out of range, only  %.2f <= gamma_value <= %.1f"

-		 " is valid\n", GAMMA_MIN, GAMMA_MAX);

-	  return 0;

-       }

-       if (!strcmp(argv[i-1], "-gamma"))

-	  xf86Gamma.red = xf86Gamma.green = xf86Gamma.blue = gamma;

-       else if (!strcmp(argv[i-1], "-rgamma")) xf86Gamma.red = gamma;

-       else if (!strcmp(argv[i-1], "-ggamma")) xf86Gamma.green = gamma;

-       else if (!strcmp(argv[i-1], "-bgamma")) xf86Gamma.blue = gamma;

-       return 2;

-    }

-  }

-  if (!strcmp(argv[i], "-layout"))

-  {

-    CHECK_FOR_REQUIRED_ARGUMENT();

-    xf86LayoutName = argv[++i];

-    return 2;

-  }

-  if (!strcmp(argv[i], "-screen"))

-  {

-    CHECK_FOR_REQUIRED_ARGUMENT();

-    xf86ScreenName = argv[++i];

-    return 2;

-  }

-  if (!strcmp(argv[i], "-pointer"))

-  {

-    CHECK_FOR_REQUIRED_ARGUMENT();

-    xf86PointerName = argv[++i];

-    return 2;

-  }

-  if (!strcmp(argv[i], "-keyboard"))

-  {

-    CHECK_FOR_REQUIRED_ARGUMENT();

-    xf86KeyboardName = argv[++i];

-    return 2;

-  }

-  if (!strcmp(argv[i], "-nosilk"))

-  {

-    xf86silkenMouseDisableFlag = TRUE;

-    return 1;

-  }

-#ifdef HAVE_ACPI

-  if (!strcmp(argv[i], "-noacpi"))

-  {

-    xf86acpiDisableFlag = TRUE;

-    return 1;

-  }

-#endif

-  if (!strcmp(argv[i], "-configure"))

-  {

-    if (getuid() != 0 && geteuid() == 0) {

-	ErrorF("The '-configure' option can only be used by root.\n");

-	exit(1);

-    }

-    xf86DoConfigure = TRUE;

-    xf86AllowMouseOpenFail = TRUE;

-    return 1;

-  }

-  if (!strcmp(argv[i], "-showopts"))

-  {

-    if (getuid() != 0 && geteuid() == 0) {

-    ErrorF("The '-showopts' option can only be used by root.\n");

-    exit(1);

-    }

-    xf86DoShowOptions = TRUE;

-    return 1;

-  }

-  if (!strcmp(argv[i], "-isolateDevice"))

-  {

-    CHECK_FOR_REQUIRED_ARGUMENT();

-    if (strncmp(argv[++i], "PCI:", 4)) {

-       FatalError("Bus types other than PCI not yet isolable\n");

-    }

-    xf86PciIsolateDevice(argv[i]);

-    return 2;

-  }

-  /* Notice cmdline xkbdir, but pass to dix as well */

-  if (!strcmp(argv[i], "-xkbdir"))

-  {

-    xf86xkbdirFlag = TRUE;

-    return 0;

-  }

-

-  /* OS-specific processing */

-  return xf86ProcessArgument(argc, argv, i);

-}

-

-/*

- * ddxUseMsg --

- *	Print out correct use of device dependent commandline options.

- *      Maybe the user now knows what really to do ...

- */

-

-void

-ddxUseMsg(void)

-{

-  ErrorF("\n");

-  ErrorF("\n");

-  ErrorF("Device Dependent Usage\n");

-  if (getuid() == 0 || geteuid() != 0)

-  {

-    ErrorF("-modulepath paths      specify the module search path\n");

-    ErrorF("-logfile file          specify a log file name\n");

-    ErrorF("-configure             probe for devices and write an "__XCONFIGFILE__"\n");

-    ErrorF("-showopts              print available options for all installed drivers\n");

-  }

-  ErrorF("-config file           specify a configuration file, relative to the\n");

-  ErrorF("                       "__XCONFIGFILE__" search path, only root can use absolute\n");

-  ErrorF("-configdir dir         specify a configuration directory, relative to the\n");

-  ErrorF("                       "__XCONFIGDIR__" search path, only root can use absolute\n");

-  ErrorF("-verbose [n]           verbose startup messages\n");

-  ErrorF("-logverbose [n]        verbose log messages\n");

-  ErrorF("-quiet                 minimal startup messages\n");

-  ErrorF("-pixmap24              use 24bpp pixmaps for depth 24\n");

-  ErrorF("-pixmap32              use 32bpp pixmaps for depth 24\n");

-  ErrorF("-fbbpp n               set bpp for the framebuffer. Default: 8\n");

-  ErrorF("-depth n               set colour depth. Default: 8\n");

-  ErrorF("-gamma f               set gamma value (0.1 < f < 10.0) Default: 1.0\n");

-  ErrorF("-rgamma f              set gamma value for red phase\n");

-  ErrorF("-ggamma f              set gamma value for green phase\n");

-  ErrorF("-bgamma f              set gamma value for blue phase\n");

-  ErrorF("-weight nnn            set RGB weighting at 16 bpp.  Default: 565\n");

-  ErrorF("-layout name           specify the ServerLayout section name\n");

-  ErrorF("-screen name           specify the Screen section name\n");

-  ErrorF("-keyboard name         specify the core keyboard InputDevice name\n");

-  ErrorF("-pointer name          specify the core pointer InputDevice name\n");

-  ErrorF("-nosilk                disable Silken Mouse\n");

-  ErrorF("-flipPixels            swap default black/white Pixel values\n");

-#ifdef XF86VIDMODE

-  ErrorF("-disableVidMode        disable mode adjustments with xvidtune\n");

-  ErrorF("-allowNonLocalXvidtune allow xvidtune to be run as a non-local client\n");

-#endif

-  ErrorF("-allowMouseOpenFail    start server even if the mouse can't be initialized\n");

-  ErrorF("-ignoreABI             make module ABI mismatches non-fatal\n");

-  ErrorF("-isolateDevice bus_id  restrict device resets to bus_id (PCI only)\n");

-  ErrorF("-version               show the server version\n");

-  ErrorF("-showDefaultModulePath show the server default module path\n");

-  ErrorF("-showDefaultLibPath    show the server default library path\n");

-  /* OS-specific usage */

-  xf86UseMsg();

-  ErrorF("\n");

-}

-

-

-/*

- * xf86LoadModules iterates over a list that is being passed in.

- */

-Bool

-xf86LoadModules(char **list, pointer *optlist)

-{

-    int errmaj, errmin;

-    pointer opt;

-    int i;

-    char *name;

-    Bool failed = FALSE;

-

-    if (!list)

-	return TRUE;

-

-    for (i = 0; list[i] != NULL; i++) {

-

-	/* Normalise the module name */

-	name = xf86NormalizeName(list[i]);

-

-	/* Skip empty names */

-	if (name == NULL || *name == '\0')

-	    continue;

-

-	/* Replace obsolete keyboard driver with kbd */

-	if (!xf86NameCmp(name, "keyboard")) {

-	    strcpy(name, "kbd");

-	}

-

-	if (optlist)

-	    opt = optlist[i];

-	else

-	    opt = NULL;

-

-        if (!LoadModule(name, NULL, NULL, NULL, opt, NULL, &errmaj, &errmin)) {

-	    LoaderErrorMsg(NULL, name, errmaj, errmin);

-	    failed = TRUE;

-	}

-	free(name);

-    }

-    return !failed;

-}

-

-/* Pixmap format stuff */

-

-PixmapFormatPtr

-xf86GetPixFormat(ScrnInfoPtr pScrn, int depth)

-{

-    int i;

-    static PixmapFormatRec format;	/* XXX not reentrant */

-

-    /*

-     * When the formats[] list initialisation isn't complete, check the

-     * depth 24 pixmap config/cmdline options and screen-specified formats.

-     */

-

-    if (!formatsDone) {

-	if (depth == 24) {

-	    Pix24Flags pix24 = Pix24DontCare;

-

-	    format.depth = 24;

-	    format.scanlinePad = BITMAP_SCANLINE_PAD;

-	    if (xf86Info.pixmap24 != Pix24DontCare)

-		pix24 = xf86Info.pixmap24;

-	    else if (pScrn->pixmap24 != Pix24DontCare)

-		pix24 = pScrn->pixmap24;

-	    if (pix24 == Pix24Use24)

-		format.bitsPerPixel = 24;

-	    else

-		format.bitsPerPixel = 32;

-	    return &format;

-	}

-    }

-

-    for (i = 0; i < numFormats; i++)

-	if (formats[i].depth == depth)

-	   break;

-    if (i != numFormats)

-	return &formats[i];

-    else if (!formatsDone) {

-	/* Check for screen-specified formats */

-	for (i = 0; i < pScrn->numFormats; i++)

-	    if (pScrn->formats[i].depth == depth)

-		break;

-	if (i != pScrn->numFormats)

-	    return &pScrn->formats[i];

-    }

-    return NULL;

-}

-

-int

-xf86GetBppFromDepth(ScrnInfoPtr pScrn, int depth)

-{

-    PixmapFormatPtr format;

-

-

-    format = xf86GetPixFormat(pScrn, depth);

-    if (format)

-	return format->bitsPerPixel;

-    else

-	return 0;

-}

+/*
+ * Loosely based on code bearing the following copyright:
+ *
+ *   Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
+ */
+/*
+ * Copyright (c) 1992-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 <stdlib.h>
+#include <errno.h>
+
+#undef HAS_UTSNAME
+#if !defined(WIN32)
+#define HAS_UTSNAME 1
+#include <sys/utsname.h>
+#endif
+
+#include <X11/X.h>
+#include <X11/Xmd.h>
+#include <X11/Xproto.h>
+#include <X11/Xatom.h>
+#include "input.h"
+#include "servermd.h"
+#include "windowstr.h"
+#include "scrnintstr.h"
+#include "site.h"
+#include "mi.h"
+
+#include "compiler.h"
+
+#include "loaderProcs.h"
+#ifdef XFreeXDGA
+#include "dgaproc.h"
+#endif
+
+#define XF86_OS_PRIVS
+#include "xf86.h"
+#include "xf86Priv.h"
+#include "xf86Config.h"
+#include "xf86_OSlib.h"
+#include "xf86cmap.h"
+#include "xorgVersion.h"
+#include "xf86Build.h"
+#include "mipointer.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
+#include "xf86DDC.h"
+#include "xf86Xinput.h"
+#include "xf86InPriv.h"
+#include "picturestr.h"
+
+#include "xf86Bus.h"
+#include "xf86VGAarbiter.h"
+#include "globals.h"
+
+#ifdef DPMSExtension
+#include <X11/extensions/dpmsconst.h>
+#include "dpmsproc.h"
+#endif
+#include <hotplug.h>
+
+
+#ifdef XF86PM
+void (*xf86OSPMClose)(void) = NULL;
+#endif
+static Bool xorgHWOpenConsole = FALSE;
+
+/* Common pixmap formats */
+
+static PixmapFormatRec formats[MAXFORMATS] = {
+	{ 1,	1,	BITMAP_SCANLINE_PAD },
+	{ 4,	8,	BITMAP_SCANLINE_PAD },
+	{ 8,	8,	BITMAP_SCANLINE_PAD },
+	{ 15,	16,	BITMAP_SCANLINE_PAD },
+	{ 16,	16,	BITMAP_SCANLINE_PAD },
+	{ 24,	32,	BITMAP_SCANLINE_PAD },
+	{ 32,	32,	BITMAP_SCANLINE_PAD },
+};
+static int numFormats = 7;
+static Bool formatsDone = FALSE;
+
+#ifndef OSNAME
+#define OSNAME " unknown"
+#endif
+#ifndef OSVENDOR
+#define OSVENDOR ""
+#endif
+#ifndef PRE_RELEASE
+#define PRE_RELEASE XORG_VERSION_SNAP
+#endif
+
+static void
+xf86PrintBanner(void)
+{
+#if PRE_RELEASE
+  xf86ErrorFVerb(0, "\n"
+    "This is a pre-release version of the X server from " XVENDORNAME ".\n"
+    "It is not supported in any way.\n"
+    "Bugs may be filed in the bugzilla at http://bugs.freedesktop.org/.\n"
+    "Select the \"xorg\" product for bugs you find in this release.\n"
+    "Before reporting bugs in pre-release versions please check the\n"
+    "latest version in the X.Org Foundation git repository.\n"
+    "See http://wiki.x.org/wiki/GitPage for git access instructions.\n");
+#endif
+  xf86ErrorFVerb(0, "\nX.Org X Server %d.%d.%d",
+	 XORG_VERSION_MAJOR,
+	 XORG_VERSION_MINOR,
+	 XORG_VERSION_PATCH);
+#if XORG_VERSION_SNAP > 0
+  xf86ErrorFVerb(0, ".%d", XORG_VERSION_SNAP);
+#endif
+
+#if XORG_VERSION_SNAP >= 900
+  /* When the minor number is 99, that signifies that the we are making
+   * a release candidate for a major version.  (X.0.0)
+   * When the patch number is 99, that signifies that the we are making
+   * a release candidate for a minor version.  (X.Y.0)
+   * When the patch number is < 99, then we are making a release
+   * candidate for the next point release.  (X.Y.Z)
+   */
+#if XORG_VERSION_MINOR >= 99
+  xf86ErrorFVerb(0, " (%d.0.0 RC %d)", XORG_VERSION_MAJOR+1,
+                 XORG_VERSION_SNAP - 900);
+#elif XORG_VERSION_PATCH == 99
+  xf86ErrorFVerb(0, " (%d.%d.0 RC %d)", XORG_VERSION_MAJOR,
+                 XORG_VERSION_MINOR + 1, XORG_VERSION_SNAP - 900);
+#else
+  xf86ErrorFVerb(0, " (%d.%d.%d RC %d)", XORG_VERSION_MAJOR,
+                 XORG_VERSION_MINOR, XORG_VERSION_PATCH + 1,
+                 XORG_VERSION_SNAP - 900);
+#endif
+#endif
+
+#ifdef XORG_CUSTOM_VERSION
+  xf86ErrorFVerb(0, " (%s)", XORG_CUSTOM_VERSION);
+#endif
+#ifndef XORG_DATE
+# define XORG_DATE "Unknown"
+#endif
+  xf86ErrorFVerb(0, "\nRelease Date: %s\n", XORG_DATE);
+  xf86ErrorFVerb(0, "X Protocol Version %d, Revision %d\n",
+         X_PROTOCOL, X_PROTOCOL_REVISION);
+  xf86ErrorFVerb(0, "Build Operating System: %s %s\n", OSNAME, OSVENDOR);
+#ifdef HAS_UTSNAME
+  {
+    struct utsname name;
+
+    /* Linux & BSD state that 0 is success, SysV (including Solaris, HP-UX,
+       and Irix) and Single Unix Spec 3 just say that non-negative is success.
+       All agree that failure is represented by a negative number.
+     */
+    if (uname(&name) >= 0) {
+      xf86ErrorFVerb(0, "Current Operating System: %s %s %s %s %s\n",
+	name.sysname, name.nodename, name.release, name.version, name.machine);
+#ifdef linux
+      do {
+	  char buf[80];
+	  int fd = open("/proc/cmdline", O_RDONLY);
+	  if (fd != -1) {
+	    xf86ErrorFVerb(0, "Kernel command line: ");
+	    memset(buf, 0, 80);
+	    while (read(fd, buf, 80) > 0) {
+		xf86ErrorFVerb(0, "%.80s", buf);
+		memset(buf, 0, 80);
+	    }
+	    close(fd);
+	  } 
+      } while (0);
+#endif
+    }
+  }
+#endif
+#if defined(BUILD_DATE) && (BUILD_DATE > 19000000)
+  {
+    struct tm t;
+    char buf[100];
+
+    memset(&t, 0, sizeof(t));
+    memset(buf, 0, sizeof(buf));
+    t.tm_mday = BUILD_DATE % 100;
+    t.tm_mon = (BUILD_DATE / 100) % 100 - 1;
+    t.tm_year = BUILD_DATE / 10000 - 1900;
+#if defined(BUILD_TIME)
+    t.tm_sec = BUILD_TIME % 100;
+    t.tm_min = (BUILD_TIME / 100) % 100;
+    t.tm_hour = (BUILD_TIME / 10000) % 100;
+    if (strftime(buf, sizeof(buf), "%d %B %Y  %I:%M:%S%p", &t))
+       xf86ErrorFVerb(0, "Build Date: %s\n", buf);
+#else
+    if (strftime(buf, sizeof(buf), "%d %B %Y", &t))
+       xf86ErrorFVerb(0, "Build Date: %s\n", buf);
+#endif
+  }
+#endif
+#if defined(BUILDERSTRING)
+  xf86ErrorFVerb(0, "%s \n", BUILDERSTRING);
+#endif
+  xf86ErrorFVerb(0, "Current version of pixman: %s\n",
+                 pixman_version_string());
+  xf86ErrorFVerb(0, "\tBefore reporting problems, check "
+                 ""__VENDORDWEBSUPPORT__"\n"
+                 "\tto make sure that you have the latest version.\n");
+}
+
+static void
+xf86PrintMarkers(void)
+{
+  LogPrintMarkers();
+}
+
+static Bool
+xf86CreateRootWindow(WindowPtr pWin)
+{
+  int ret = TRUE;
+  int err = Success;
+  ScreenPtr pScreen = pWin->drawable.pScreen;
+  RootWinPropPtr pProp;
+  CreateWindowProcPtr CreateWindow = (CreateWindowProcPtr)
+      dixLookupPrivate(&pScreen->devPrivates, xf86CreateRootWindowKey);
+
+  DebugF("xf86CreateRootWindow(%p)\n", pWin);
+
+  if ( pScreen->CreateWindow != xf86CreateRootWindow ) {
+    /* Can't find hook we are hung on */
+	xf86DrvMsg(pScreen->myNum, X_WARNING /* X_ERROR */,
+		  "xf86CreateRootWindow %p called when not in pScreen->CreateWindow %p n",
+		   (void *)xf86CreateRootWindow,
+		   (void *)pScreen->CreateWindow );
+  }
+
+  /* Unhook this function ... */
+  pScreen->CreateWindow = CreateWindow;
+  dixSetPrivate(&pScreen->devPrivates, xf86CreateRootWindowKey, NULL);
+
+  /* ... and call the previous CreateWindow fuction, if any */
+  if (NULL!=pScreen->CreateWindow) {
+    ret = (*pScreen->CreateWindow)(pWin);
+  }
+
+  /* Now do our stuff */
+  if (xf86RegisteredPropertiesTable != NULL) {
+    if (pWin->parent == NULL && xf86RegisteredPropertiesTable != NULL) {
+      for (pProp = xf86RegisteredPropertiesTable[pScreen->myNum];
+	   pProp != NULL && err==Success;
+	   pProp = pProp->next )
+	{
+	  Atom prop;
+
+	  prop = MakeAtom(pProp->name, strlen(pProp->name), TRUE);
+	  err = dixChangeWindowProperty(serverClient, pWin,
+					prop, pProp->type,
+					pProp->format, PropModeReplace,
+					pProp->size, pProp->data,
+					FALSE);
+	}
+
+      /* Look at err */
+      ret &= (err==Success);
+
+    } else {
+      xf86Msg(X_ERROR, "xf86CreateRootWindow unexpectedly called with "
+	      "non-root window %p (parent %p)\n",
+	      (void *)pWin, (void *)pWin->parent);
+      ret = FALSE;
+    }
+  }
+
+  DebugF("xf86CreateRootWindow() returns %d\n", ret);
+  return ret;
+}
+
+
+static void
+InstallSignalHandlers(void)
+{
+    /*
+     * Install signal handler for unexpected signals
+     */
+    xf86Info.caughtSignal=FALSE;
+    if (!xf86Info.notrapSignals) {
+	OsRegisterSigWrapper(xf86SigWrapper);
+    } else {
+	signal(SIGSEGV, SIG_DFL);
+	signal(SIGILL, SIG_DFL);
+#ifdef SIGEMT
+	signal(SIGEMT, SIG_DFL);
+#endif
+	signal(SIGFPE, SIG_DFL);
+	signal(SIGBUS, SIG_DFL);
+	signal(SIGSYS, SIG_DFL);
+	signal(SIGXCPU, SIG_DFL);
+	signal(SIGXFSZ, SIG_DFL);
+    }
+}
+
+/*
+ * InitOutput --
+ *	Initialize screenInfo for all actually accessible framebuffers.
+ *      That includes vt-manager setup, querying all possible devices and
+ *      collecting the pixmap formats.
+ */
+void
+InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)
+{
+  int                    i, j, k, scr_index, was_blocked = 0;
+  char                   **modulelist;
+  pointer                *optionlist;
+  Pix24Flags		 screenpix24, pix24;
+  MessageType		 pix24From = X_DEFAULT;
+  Bool			 pix24Fail = FALSE;
+  Bool			 autoconfig = FALSE;
+  GDevPtr		 configured_device;
+
+  xf86Initialising = TRUE;
+
+  if (serverGeneration == 1) {
+    if ((xf86ServerName = strrchr(argv[0], '/')) != 0)
+      xf86ServerName++;
+    else
+      xf86ServerName = argv[0];
+
+	xf86PrintBanner();
+	xf86PrintMarkers();
+	if (xf86LogFile)  {
+	    time_t t;
+	    const char *ct;
+	    t = time(NULL);
+	    ct = ctime(&t);
+	    xf86MsgVerb(xf86LogFileFrom, 0, "Log file: \"%s\", Time: %s",
+			xf86LogFile, ct);
+	}
+
+    /* Read and parse the config file */
+    if (!xf86DoConfigure && !xf86DoShowOptions) {
+      switch (xf86HandleConfigFile(FALSE)) {
+      case CONFIG_OK:
+	break;
+      case CONFIG_PARSE_ERROR:
+	xf86Msg(X_ERROR, "Error parsing the config file\n");
+	return;
+      case CONFIG_NOFILE:
+	autoconfig = TRUE;
+	break;
+      }
+    }
+
+    InstallSignalHandlers();
+
+    /* Initialise the loader */
+    LoaderInit();
+
+    /* Tell the loader the default module search path */
+    LoaderSetPath(xf86ModulePath);
+
+    if (xf86Info.ignoreABI) {
+        LoaderSetOptions(LDR_OPT_ABI_MISMATCH_NONFATAL);
+    }
+
+    if (xf86DoShowOptions)
+        DoShowOptions();
+
+    /* Do a general bus probe.  This will be a PCI probe for x86 platforms */
+    xf86BusProbe();
+
+    if (xf86DoConfigure)
+	DoConfigure();
+
+    if (autoconfig) {
+	if (!xf86AutoConfig()) {
+	    xf86Msg(X_ERROR, "Auto configuration failed\n");
+	    return;
+	}
+    }
+
+#ifdef XF86PM
+    xf86OSPMClose = xf86OSPMOpen();
+#endif
+
+    /* Load all modules specified explicitly in the config file */
+    if ((modulelist = xf86ModulelistFromConfig(&optionlist))) {
+      xf86LoadModules(modulelist, optionlist);
+      free(modulelist);
+      free(optionlist);
+    }
+
+    /* Load all driver modules specified in the config file */
+    /* If there aren't any specified in the config file, autoconfig them */
+    /* FIXME: Does not handle multiple active screen sections, but I'm not
+     * sure if we really want to handle that case*/
+    configured_device = xf86ConfigLayout.screens->screen->device;
+    if ((!configured_device) || (!configured_device->driver)) {
+        if (!autoConfigDevice(configured_device)) {
+            xf86Msg(X_ERROR, "Automatic driver configuration failed\n");
+            return ;
+        }
+    }
+    if ((modulelist = xf86DriverlistFromConfig())) {
+      xf86LoadModules(modulelist, NULL);
+      free(modulelist);
+    }
+
+    /* Load all input driver modules specified in the config file. */
+    if ((modulelist = xf86InputDriverlistFromConfig())) {
+      xf86LoadModules(modulelist, NULL);
+      free(modulelist);
+    }
+
+    /*
+     * It is expected that xf86AddDriver()/xf86AddInputDriver will be
+     * called for each driver as it is loaded.  Those functions save the
+     * module pointers for drivers.
+     * XXX Nothing keeps track of them for other modules.
+     */
+    /* XXX What do we do if not all of these could be loaded? */
+
+    /*
+     * At this point, xf86DriverList[] is all filled in with entries for
+     * each of the drivers to try and xf86NumDrivers has the number of
+     * drivers.  If there are none, return now.
+     */
+
+    if (xf86NumDrivers == 0) {
+      xf86Msg(X_ERROR, "No drivers available.\n");
+      return;
+    }
+
+    /*
+     * Call each of the Identify functions and call the driverFunc to check
+     * if HW access is required.  The Identify functions print out some
+     * identifying information, and anything else that might be
+     * needed at this early stage.
+     */
+
+    for (i = 0; i < xf86NumDrivers; i++) {
+	if (xf86DriverList[i]->Identify != NULL)
+	    xf86DriverList[i]->Identify(0);
+
+	if (!xorgHWAccess || !xorgHWOpenConsole) {
+	    xorgHWFlags flags;
+	    if(!xf86DriverList[i]->driverFunc
+		|| !xf86DriverList[i]->driverFunc(NULL,
+						  GET_REQUIRED_HW_INTERFACES,
+						  &flags))
+		flags = HW_IO;
+
+	    if(NEED_IO_ENABLED(flags))
+		xorgHWAccess = TRUE;
+	    if(!(flags & HW_SKIP_CONSOLE))
+		xorgHWOpenConsole = TRUE;
+	}
+    }
+
+    if (xorgHWOpenConsole)
+	xf86OpenConsole();
+    else
+	xf86Info.dontVTSwitch = TRUE;
+
+    if (xf86BusConfig() == FALSE)
+        return;
+
+    xf86PostProbe();
+
+    /*
+     * Sort the drivers to match the requested ording.  Using a slow
+     * bubble sort.
+     */
+    for (j = 0; j < xf86NumScreens - 1; j++) {
+	for (i = 0; i < xf86NumScreens - j - 1; i++) {
+	    if (xf86Screens[i + 1]->confScreen->screennum <
+		xf86Screens[i]->confScreen->screennum) {
+		ScrnInfoPtr tmpScrn = xf86Screens[i + 1];
+		xf86Screens[i + 1] = xf86Screens[i];
+		xf86Screens[i] = tmpScrn;
+	    }
+	}
+    }
+    /* Fix up the indexes */
+    for (i = 0; i < xf86NumScreens; i++) {
+	xf86Screens[i]->scrnIndex = i;
+    }
+
+    /*
+     * Call the driver's PreInit()'s to complete initialisation for the first
+     * generation.
+     */
+
+    for (i = 0; i < xf86NumScreens; i++) {
+	xf86VGAarbiterScrnInit(xf86Screens[i]);
+	xf86VGAarbiterLock(xf86Screens[i]);
+	if (xf86Screens[i]->PreInit &&
+	    xf86Screens[i]->PreInit(xf86Screens[i], 0))
+	    xf86Screens[i]->configured = TRUE;
+	xf86VGAarbiterUnlock(xf86Screens[i]);
+    }
+    for (i = 0; i < xf86NumScreens; i++)
+	if (!xf86Screens[i]->configured)
+	    xf86DeleteScreen(i--, 0);
+
+    /*
+     * If no screens left, return now.
+     */
+
+    if (xf86NumScreens == 0) {
+      xf86Msg(X_ERROR,
+	      "Screen(s) found, but none have a usable configuration.\n");
+      return;
+    }
+
+    for (i = 0; i < xf86NumScreens; i++) {
+      if (xf86Screens[i]->name == NULL) {
+	XNFasprintf(&xf86Screens[i]->name, "screen%d", i);
+	xf86MsgVerb(X_WARNING, 0,
+		    "Screen driver %d has no name set, using `%s'.\n",
+		    i, xf86Screens[i]->name);
+      }
+    }
+
+    /* Remove (unload) drivers that are not required */
+    for (i = 0; i < xf86NumDrivers; i++)
+	if (xf86DriverList[i] && xf86DriverList[i]->refCount <= 0)
+	    xf86DeleteDriver(i);
+
+    /*
+     * At this stage we know how many screens there are.
+     */
+
+    for (i = 0; i < xf86NumScreens; i++)
+      xf86InitViewport(xf86Screens[i]);
+
+    /*
+     * Collect all pixmap formats and check for conflicts at the display
+     * level.  Should we die here?  Or just delete the offending screens?
+     */
+    screenpix24 = Pix24DontCare;
+    for (i = 0; i < xf86NumScreens; i++) {
+	if (xf86Screens[i]->imageByteOrder !=
+	    xf86Screens[0]->imageByteOrder)
+	    FatalError("Inconsistent display bitmapBitOrder.  Exiting\n");
+	if (xf86Screens[i]->bitmapScanlinePad !=
+	    xf86Screens[0]->bitmapScanlinePad)
+	    FatalError("Inconsistent display bitmapScanlinePad.  Exiting\n");
+	if (xf86Screens[i]->bitmapScanlineUnit !=
+	    xf86Screens[0]->bitmapScanlineUnit)
+	    FatalError("Inconsistent display bitmapScanlineUnit.  Exiting\n");
+	if (xf86Screens[i]->bitmapBitOrder !=
+	    xf86Screens[0]->bitmapBitOrder)
+	    FatalError("Inconsistent display bitmapBitOrder.  Exiting\n");
+
+	/* Determine the depth 24 pixmap format the screens would like */
+	if (xf86Screens[i]->pixmap24 != Pix24DontCare) {
+	    if (screenpix24 == Pix24DontCare)
+		screenpix24 = xf86Screens[i]->pixmap24;
+	    else if (screenpix24 != xf86Screens[i]->pixmap24)
+		FatalError("Inconsistent depth 24 pixmap format.  Exiting\n");
+	}
+    }
+    /* check if screenpix24 is consistent with the config/cmdline */
+    if (xf86Info.pixmap24 != Pix24DontCare) {
+	pix24 = xf86Info.pixmap24;
+	pix24From = xf86Info.pix24From;
+	if (screenpix24 != Pix24DontCare && screenpix24 != xf86Info.pixmap24)
+	    pix24Fail = TRUE;
+    } else if (screenpix24 != Pix24DontCare) {
+	pix24 = screenpix24;
+	pix24From = X_PROBED;
+    } else
+	pix24 = Pix24Use32;
+
+    if (pix24Fail)
+	FatalError("Screen(s) can't use the required depth 24 pixmap format"
+		   " (%d).  Exiting\n", PIX24TOBPP(pix24));
+
+    /* Initialise the depth 24 format */
+    for (j = 0; j < numFormats && formats[j].depth != 24; j++)
+	;
+    formats[j].bitsPerPixel = PIX24TOBPP(pix24);
+
+    /* Collect additional formats */
+    for (i = 0; i < xf86NumScreens; i++) {
+	for (j = 0; j < xf86Screens[i]->numFormats; j++) {
+	    for (k = 0; ; k++) {
+		if (k >= numFormats) {
+		    if (k >= MAXFORMATS)
+			FatalError("Too many pixmap formats!  Exiting\n");
+		    formats[k] = xf86Screens[i]->formats[j];
+		    numFormats++;
+		    break;
+		}
+		if (formats[k].depth == xf86Screens[i]->formats[j].depth) {
+		    if ((formats[k].bitsPerPixel ==
+			 xf86Screens[i]->formats[j].bitsPerPixel) &&
+		        (formats[k].scanlinePad ==
+			 xf86Screens[i]->formats[j].scanlinePad))
+			break;
+		    FatalError("Inconsistent pixmap format for depth %d."
+			       "  Exiting\n", formats[k].depth);
+		}
+	    }
+	}
+    }
+    formatsDone = TRUE;
+
+    if (xf86Info.vtno >= 0 ) {
+#define VT_ATOM_NAME         "XFree86_VT"
+      Atom VTAtom=-1;
+      CARD32  *VT = NULL;
+      int  ret;
+
+      /* This memory needs to stay available until the screen has been
+	 initialized, and we can create the property for real.
+      */
+      if ( (VT = malloc(sizeof(CARD32)))==NULL ) {
+	FatalError("Unable to make VT property - out of memory. Exiting...\n");
+      }
+      *VT = xf86Info.vtno;
+
+      VTAtom = MakeAtom(VT_ATOM_NAME, sizeof(VT_ATOM_NAME) - 1, TRUE);
+
+      for (i = 0, ret = Success; i < xf86NumScreens && ret == Success; i++) {
+	ret = xf86RegisterRootWindowProperty(xf86Screens[i]->scrnIndex,
+					     VTAtom, XA_INTEGER, 32,
+					     1, VT );
+	if (ret != Success)
+	  xf86DrvMsg(xf86Screens[i]->scrnIndex, X_WARNING,
+		     "Failed to register VT property\n");
+      }
+    }
+
+    /* If a screen uses depth 24, show what the pixmap format is */
+    for (i = 0; i < xf86NumScreens; i++) {
+	if (xf86Screens[i]->depth == 24) {
+	    xf86Msg(pix24From, "Depth 24 pixmap format is %d bpp\n",
+		    PIX24TOBPP(pix24));
+	    break;
+	}
+    }
+  } else {
+    /*
+     * serverGeneration != 1; some OSs have to do things here, too.
+     */
+    if (xorgHWOpenConsole)
+	xf86OpenConsole();
+
+#ifdef XF86PM
+    /*
+      should we reopen it here? We need to deal with an already opened
+      device. We could leave this to the OS layer. For now we simply
+      close it here
+    */
+    if (xf86OSPMClose)
+        xf86OSPMClose();
+    if ((xf86OSPMClose = xf86OSPMOpen()) != NULL)
+	xf86MsgVerb(X_INFO, 3, "APM registered successfully\n");
+#endif
+
+    /* Make sure full I/O access is enabled */
+    if (xorgHWAccess)
+	xf86EnableIO();
+  }
+
+  /*
+   * Use the previously collected parts to setup pScreenInfo
+   */
+
+  pScreenInfo->imageByteOrder = xf86Screens[0]->imageByteOrder;
+  pScreenInfo->bitmapScanlinePad = xf86Screens[0]->bitmapScanlinePad;
+  pScreenInfo->bitmapScanlineUnit = xf86Screens[0]->bitmapScanlineUnit;
+  pScreenInfo->bitmapBitOrder = xf86Screens[0]->bitmapBitOrder;
+  pScreenInfo->numPixmapFormats = numFormats;
+  for (i = 0; i < numFormats; i++)
+    pScreenInfo->formats[i] = formats[i];
+
+  /* Make sure the server's VT is active */
+
+  if (serverGeneration != 1) {
+    xf86Resetting = TRUE;
+    /* All screens are in the same state, so just check the first */
+    if (!xf86Screens[0]->vtSema) {
+#ifdef HAS_USL_VTS
+      ioctl(xf86Info.consoleFd, VT_RELDISP, VT_ACKACQ);
+#endif
+      xf86AccessEnter();
+      was_blocked = xf86BlockSIGIO();
+    }
+  }
+
+  for (i = 0; i < xf86NumScreens; i++)
+      if (!xf86ColormapAllocatePrivates(xf86Screens[i]))
+	  FatalError("Cannot register DDX private keys");
+
+  if (!dixRegisterPrivateKey(&xf86ScreenKeyRec, PRIVATE_SCREEN, 0) ||
+      !dixRegisterPrivateKey(&xf86CreateRootWindowKeyRec, PRIVATE_SCREEN, 0))
+      FatalError("Cannot register DDX private keys");
+
+  for (i = 0; i < xf86NumScreens; i++) {
+	xf86VGAarbiterLock(xf86Screens[i]);
+	/*
+	 * Almost everything uses these defaults, and many of those that
+	 * don't, will wrap them.
+	 */
+	xf86Screens[i]->EnableDisableFBAccess = xf86EnableDisableFBAccess;
+#ifdef XFreeXDGA
+	xf86Screens[i]->SetDGAMode = xf86SetDGAMode;
+#endif
+	xf86Screens[i]->DPMSSet = NULL;
+	xf86Screens[i]->LoadPalette = NULL;
+	xf86Screens[i]->SetOverscan = NULL;
+	xf86Screens[i]->DriverFunc = NULL;
+	xf86Screens[i]->pScreen = NULL;
+	scr_index = AddScreen(xf86Screens[i]->ScreenInit, argc, argv);
+	xf86VGAarbiterUnlock(xf86Screens[i]);
+      if (scr_index == i) {
+	/*
+	 * Hook in our ScrnInfoRec, and initialise some other pScreen
+	 * fields.
+	 */
+	dixSetPrivate(&screenInfo.screens[scr_index]->devPrivates,
+		      xf86ScreenKey, xf86Screens[i]);
+	xf86Screens[i]->pScreen = screenInfo.screens[scr_index];
+	/* The driver should set this, but make sure it is set anyway */
+	xf86Screens[i]->vtSema = TRUE;
+      } else {
+	/* This shouldn't normally happen */
+	FatalError("AddScreen/ScreenInit failed for driver %d\n", i);
+      }
+
+      DebugF("InitOutput - xf86Screens[%d]->pScreen = %p\n",
+	     i, xf86Screens[i]->pScreen );
+      DebugF("xf86Screens[%d]->pScreen->CreateWindow = %p\n",
+	     i, xf86Screens[i]->pScreen->CreateWindow );
+
+      dixSetPrivate(&screenInfo.screens[scr_index]->devPrivates,
+		    xf86CreateRootWindowKey,
+		    xf86Screens[i]->pScreen->CreateWindow);
+      xf86Screens[i]->pScreen->CreateWindow = xf86CreateRootWindow;
+
+    if (PictureGetSubpixelOrder (xf86Screens[i]->pScreen) == SubPixelUnknown)
+    {
+	xf86MonPtr DDC = (xf86MonPtr)(xf86Screens[i]->monitor->DDC);
+	PictureSetSubpixelOrder (xf86Screens[i]->pScreen,
+				 DDC ?
+				 (DDC->features.input_type ?
+				  SubPixelHorizontalRGB : SubPixelNone) :
+				 SubPixelUnknown);
+    }
+#ifdef RANDR
+    if (!xf86Info.disableRandR)
+	xf86RandRInit (screenInfo.screens[scr_index]);
+    xf86Msg(xf86Info.randRFrom, "RandR %s\n",
+	    xf86Info.disableRandR ? "disabled" : "enabled");
+#endif
+  }
+
+  xf86VGAarbiterWrapFunctions();
+  xf86UnblockSIGIO(was_blocked);
+
+  xf86InitOrigins();
+
+  xf86Resetting = FALSE;
+  xf86Initialising = FALSE;
+
+  RegisterBlockAndWakeupHandlers((BlockHandlerProcPtr)NoopDDA, xf86Wakeup,
+				 NULL);
+}
+
+/*
+ * InitInput --
+ *      Initialize all supported input devices.
+ */
+
+void
+InitInput(int argc, char **argv)
+{
+    InputInfoPtr* pDev;
+    DeviceIntPtr dev;
+
+    xf86Info.vtRequestsPending = FALSE;
+
+    mieqInit();
+
+    GetEventList(&xf86Events);
+
+    /* Initialize all configured input devices */
+    for (pDev = xf86ConfigLayout.inputs; pDev && *pDev; pDev++) {
+        /* Replace obsolete keyboard driver with kbd */
+        if (!xf86NameCmp((*pDev)->driver, "keyboard")) {
+            strcpy((*pDev)->driver, "kbd");
+        }
+
+        /* If one fails, the others will too */
+        if (xf86NewInputDevice(*pDev, &dev, TRUE) == BadAlloc)
+            break;
+    }
+
+    config_init();
+}
+
+void
+CloseInput (void)
+{
+    config_fini();
+}
+
+/*
+ * OsVendorInit --
+ *      OS/Vendor-specific initialisations.  Called from OsInit(), which
+ *      is called by dix before establishing the well known sockets.
+ */
+
+void
+OsVendorInit(void)
+{
+  static Bool beenHere = FALSE;
+
+  signal(SIGCHLD, SIG_DFL);	/* Need to wait for child processes */
+
+  if (!beenHere) {
+    umask(022);
+    xf86LogInit();
+  }
+
+        /* Set stderr to non-blocking. */
+#ifndef O_NONBLOCK
+#if defined(FNDELAY)
+#define O_NONBLOCK FNDELAY
+#elif defined(O_NDELAY)
+#define O_NONBLOCK O_NDELAY
+#endif
+
+#ifdef O_NONBLOCK
+  if (!beenHere) {
+    if (geteuid() == 0 && getuid() != geteuid())
+    {
+      int status;
+
+      status = fcntl(fileno(stderr), F_GETFL, 0);
+      if (status != -1) {
+	fcntl(fileno(stderr), F_SETFL, status | O_NONBLOCK);
+      }
+    }
+  }
+#endif
+#endif
+
+  beenHere = TRUE;
+}
+
+/*
+ * ddxGiveUp --
+ *      Device dependent cleanup. Called by by dix before normal server death.
+ *      For SYSV386 we must switch the terminal back to normal mode. No error-
+ *      checking here, since there should be restored as much as possible.
+ */
+
+void
+ddxGiveUp(void)
+{
+    int i;
+
+    xf86VGAarbiterFini();
+
+#ifdef XF86PM
+    if (xf86OSPMClose)
+	xf86OSPMClose();
+    xf86OSPMClose = NULL;
+#endif
+
+    for (i = 0; i < xf86NumScreens; i++) {
+	/*
+	 * zero all access functions to
+	 * trap calls when switched away.
+	 */
+	xf86Screens[i]->vtSema = FALSE;
+    }
+
+#ifdef XFreeXDGA
+    DGAShutdown();
+#endif
+
+    if (xorgHWOpenConsole)
+	xf86CloseConsole();
+
+    xf86CloseLog();
+
+    /* If an unexpected signal was caught, dump a core for debugging */
+    if (xf86Info.caughtSignal)
+	OsAbort();
+}
+
+
+
+/*
+ * AbortDDX --
+ *      DDX - specific abort routine.  Called by AbortServer(). The attempt is
+ *      made to restore all original setting of the displays. Also all devices
+ *      are closed.
+ */
+
+void
+AbortDDX(void)
+{
+  int i;
+
+  xf86BlockSIGIO();
+
+  /*
+   * try to restore the original video state
+   */
+#ifdef DPMSExtension /* Turn screens back on */
+  if (DPMSPowerLevel != DPMSModeOn)
+      DPMSSet(serverClient, DPMSModeOn);
+#endif
+  if (xf86Screens) {
+      for (i = 0; i < xf86NumScreens; i++)
+	  if (xf86Screens[i]->vtSema) {
+	      /*
+	       * if we are aborting before ScreenInit() has finished
+	       * we might not have been wrapped yet. Therefore enable
+	       * screen explicitely.
+	       */
+	      xf86VGAarbiterLock(xf86Screens[i]);
+	      (xf86Screens[i]->LeaveVT)(i, 0);
+	      xf86VGAarbiterUnlock(xf86Screens[i]);
+	  }
+  }
+
+  xf86AccessLeave();
+
+  /*
+   * This is needed for an abnormal server exit, since the normal exit stuff
+   * MUST also be performed (i.e. the vt must be left in a defined state)
+   */
+  ddxGiveUp();
+}
+
+void
+OsVendorFatalError(void)
+{
+#ifdef VENDORSUPPORT
+    ErrorF("\nPlease refer to your Operating System Vendor support pages\n"
+	   "at %s for support on this crash.\n",VENDORSUPPORT);
+#else
+    ErrorF("\nPlease consult the "XVENDORNAME" support \n"
+	   "\t at "__VENDORDWEBSUPPORT__"\n for help. \n");
+#endif
+    if (xf86LogFile && xf86LogFileWasOpened)
+	ErrorF("Please also check the log file at \"%s\" for additional "
+              "information.\n", xf86LogFile);
+    ErrorF("\n");
+}
+
+int
+xf86SetVerbosity(int verb)
+{
+    int save = xf86Verbose;
+
+    xf86Verbose = verb;
+    LogSetParameter(XLOG_VERBOSITY, verb);
+    return save;
+}
+
+int
+xf86SetLogVerbosity(int verb)
+{
+    int save = xf86LogVerbose;
+
+    xf86LogVerbose = verb;
+    LogSetParameter(XLOG_FILE_VERBOSITY, verb);
+    return save;
+}
+
+static void
+xf86PrintDefaultModulePath(void)
+{
+  ErrorF("%s\n", DEFAULT_MODULE_PATH);
+}
+
+static void
+xf86PrintDefaultLibraryPath(void)
+{
+  ErrorF("%s\n", DEFAULT_LIBRARY_PATH);
+}
+
+/*
+ * ddxProcessArgument --
+ *	Process device-dependent command line args. Returns 0 if argument is
+ *      not device dependent, otherwise Count of number of elements of argv
+ *      that are part of a device dependent commandline option.
+ *
+ */
+
+/* ARGSUSED */
+int
+ddxProcessArgument(int argc, char **argv, int i)
+{
+#define CHECK_FOR_REQUIRED_ARGUMENT() \
+    if (((i + 1) >= argc) || (!argv[i + 1])) { 				\
+      ErrorF("Required argument to %s not specified\n", argv[i]); 	\
+      UseMsg(); 							\
+      FatalError("Required argument to %s not specified\n", argv[i]);	\
+    }
+
+  /* First the options that are only allowed for root */
+  if (!strcmp(argv[i], "-modulepath") || !strcmp(argv[i], "-logfile")) {
+    if ( (geteuid() == 0) && (getuid() != 0) ) {
+      FatalError("The '%s' option can only be used by root.\n", argv[i]);
+    }
+    else if (!strcmp(argv[i], "-modulepath"))
+    {
+      char *mp;
+      CHECK_FOR_REQUIRED_ARGUMENT();
+      mp = strdup(argv[i + 1]);
+      if (!mp)
+	FatalError("Can't allocate memory for ModulePath\n");
+      xf86ModulePath = mp;
+      xf86ModPathFrom = X_CMDLINE;
+      return 2;
+    }
+    else if (!strcmp(argv[i], "-logfile"))
+    {
+      char *lf;
+      CHECK_FOR_REQUIRED_ARGUMENT();
+      lf = strdup(argv[i + 1]);
+      if (!lf)
+	FatalError("Can't allocate memory for LogFile\n");
+      xf86LogFile = lf;
+      xf86LogFileFrom = X_CMDLINE;
+      return 2;
+    }
+  }
+  if (!strcmp(argv[i], "-config") || !strcmp(argv[i], "-xf86config"))
+  {
+    CHECK_FOR_REQUIRED_ARGUMENT();
+    if (getuid() != 0 && !xf86PathIsSafe(argv[i + 1])) {
+      FatalError("\nInvalid argument for %s\n"
+	  "\tFor non-root users, the file specified with %s must be\n"
+	  "\ta relative path and must not contain any \"..\" elements.\n"
+	  "\tUsing default "__XCONFIGFILE__" search path.\n\n",
+	  argv[i], argv[i]);
+    }
+    xf86ConfigFile = argv[i + 1];
+    return 2;
+  }
+  if (!strcmp(argv[i], "-configdir"))
+  {
+    CHECK_FOR_REQUIRED_ARGUMENT();
+    if (getuid() != 0 && !xf86PathIsSafe(argv[i + 1])) {
+      FatalError("\nInvalid argument for %s\n"
+	  "\tFor non-root users, the file specified with %s must be\n"
+	  "\ta relative path and must not contain any \"..\" elements.\n"
+	  "\tUsing default "__XCONFIGDIR__" search path.\n\n",
+	  argv[i], argv[i]);
+    }
+    xf86ConfigDir = argv[i + 1];
+    return 2;
+  }
+  if (!strcmp(argv[i],"-flipPixels"))
+  {
+    xf86FlipPixels = TRUE;
+    return 1;
+  }
+#ifdef XF86VIDMODE
+  if (!strcmp(argv[i],"-disableVidMode"))
+  {
+    xf86VidModeDisabled = TRUE;
+    return 1;
+  }
+  if (!strcmp(argv[i],"-allowNonLocalXvidtune"))
+  {
+    xf86VidModeAllowNonLocal = TRUE;
+    return 1;
+  }
+#endif
+  if (!strcmp(argv[i],"-allowMouseOpenFail"))
+  {
+    xf86AllowMouseOpenFail = TRUE;
+    return 1;
+  }
+  if (!strcmp(argv[i],"-ignoreABI"))
+  {
+    LoaderSetOptions(LDR_OPT_ABI_MISMATCH_NONFATAL);
+    return 1;
+  }
+  if (!strcmp(argv[i],"-verbose"))
+  {
+    if (++i < argc && argv[i])
+    {
+      char *end;
+      long val;
+      val = strtol(argv[i], &end, 0);
+      if (*end == '\0')
+      {
+	xf86SetVerbosity(val);
+	return 2;
+      }
+    }
+    xf86SetVerbosity(++xf86Verbose);
+    return 1;
+  }
+  if (!strcmp(argv[i],"-logverbose"))
+  {
+    if (++i < argc && argv[i])
+    {
+      char *end;
+      long val;
+      val = strtol(argv[i], &end, 0);
+      if (*end == '\0')
+      {
+	xf86SetLogVerbosity(val);
+	return 2;
+      }
+    }
+    xf86SetLogVerbosity(++xf86LogVerbose);
+    return 1;
+  }
+  if (!strcmp(argv[i],"-quiet"))
+  {
+    xf86SetVerbosity(-1);
+    return 1;
+  }
+  if (!strcmp(argv[i],"-showconfig") || !strcmp(argv[i],"-version"))
+  {
+    xf86PrintBanner();
+    exit(0);
+  }
+  if (!strcmp(argv[i],"-showDefaultModulePath"))
+  {
+    xf86PrintDefaultModulePath();
+    exit(0);
+  }
+  if (!strcmp(argv[i],"-showDefaultLibPath"))
+  {
+    xf86PrintDefaultLibraryPath();
+    exit(0);
+  }
+  /* Notice the -fp flag, but allow it to pass to the dix layer */
+  if (!strcmp(argv[i], "-fp"))
+  {
+    xf86fpFlag = TRUE;
+    return 0;
+  }
+  /* Notice the -bs flag, but allow it to pass to the dix layer */
+  if (!strcmp(argv[i], "-bs"))
+  {
+    xf86bsDisableFlag = TRUE;
+    return 0;
+  }
+  /* Notice the +bs flag, but allow it to pass to the dix layer */
+  if (!strcmp(argv[i], "+bs"))
+  {
+    xf86bsEnableFlag = TRUE;
+    return 0;
+  }
+  /* Notice the -s flag, but allow it to pass to the dix layer */
+  if (!strcmp(argv[i], "-s"))
+  {
+    xf86sFlag = TRUE;
+    return 0;
+  }
+  if (!strcmp(argv[i], "-pixmap24"))
+  {
+    xf86Pix24 = Pix24Use24;
+    return 1;
+  }
+  if (!strcmp(argv[i], "-pixmap32"))
+  {
+    xf86Pix24 = Pix24Use32;
+    return 1;
+  }
+  if (!strcmp(argv[i], "-fbbpp"))
+  {
+    int bpp;
+    CHECK_FOR_REQUIRED_ARGUMENT();
+    if (sscanf(argv[++i], "%d", &bpp) == 1)
+    {
+      xf86FbBpp = bpp;
+      return 2;
+    }
+    else
+    {
+      ErrorF("Invalid fbbpp\n");
+      return 0;
+    }
+  }
+  if (!strcmp(argv[i], "-depth"))
+  {
+    int depth;
+    CHECK_FOR_REQUIRED_ARGUMENT();
+    if (sscanf(argv[++i], "%d", &depth) == 1)
+    {
+      xf86Depth = depth;
+      return 2;
+    }
+    else
+    {
+      ErrorF("Invalid depth\n");
+      return 0;
+    }
+  }
+  if (!strcmp(argv[i], "-weight"))
+  {
+    int red, green, blue;
+    CHECK_FOR_REQUIRED_ARGUMENT();
+    if (sscanf(argv[++i], "%1d%1d%1d", &red, &green, &blue) == 3)
+    {
+      xf86Weight.red = red;
+      xf86Weight.green = green;
+      xf86Weight.blue = blue;
+      return 2;
+    }
+    else
+    {
+      ErrorF("Invalid weighting\n");
+      return 0;
+    }
+  }
+  if (!strcmp(argv[i], "-gamma")  || !strcmp(argv[i], "-rgamma") ||
+      !strcmp(argv[i], "-ggamma") || !strcmp(argv[i], "-bgamma"))
+  {
+    double gamma;
+    CHECK_FOR_REQUIRED_ARGUMENT();
+    if (sscanf(argv[++i], "%lf", &gamma) == 1) {
+       if (gamma < GAMMA_MIN || gamma > GAMMA_MAX) {
+	  ErrorF("gamma out of range, only  %.2f <= gamma_value <= %.1f"
+		 " is valid\n", GAMMA_MIN, GAMMA_MAX);
+	  return 0;
+       }
+       if (!strcmp(argv[i-1], "-gamma"))
+	  xf86Gamma.red = xf86Gamma.green = xf86Gamma.blue = gamma;
+       else if (!strcmp(argv[i-1], "-rgamma")) xf86Gamma.red = gamma;
+       else if (!strcmp(argv[i-1], "-ggamma")) xf86Gamma.green = gamma;
+       else if (!strcmp(argv[i-1], "-bgamma")) xf86Gamma.blue = gamma;
+       return 2;
+    }
+  }
+  if (!strcmp(argv[i], "-layout"))
+  {
+    CHECK_FOR_REQUIRED_ARGUMENT();
+    xf86LayoutName = argv[++i];
+    return 2;
+  }
+  if (!strcmp(argv[i], "-screen"))
+  {
+    CHECK_FOR_REQUIRED_ARGUMENT();
+    xf86ScreenName = argv[++i];
+    return 2;
+  }
+  if (!strcmp(argv[i], "-pointer"))
+  {
+    CHECK_FOR_REQUIRED_ARGUMENT();
+    xf86PointerName = argv[++i];
+    return 2;
+  }
+  if (!strcmp(argv[i], "-keyboard"))
+  {
+    CHECK_FOR_REQUIRED_ARGUMENT();
+    xf86KeyboardName = argv[++i];
+    return 2;
+  }
+  if (!strcmp(argv[i], "-nosilk"))
+  {
+    xf86silkenMouseDisableFlag = TRUE;
+    return 1;
+  }
+#ifdef HAVE_ACPI
+  if (!strcmp(argv[i], "-noacpi"))
+  {
+    xf86acpiDisableFlag = TRUE;
+    return 1;
+  }
+#endif
+  if (!strcmp(argv[i], "-configure"))
+  {
+    if (getuid() != 0 && geteuid() == 0) {
+	ErrorF("The '-configure' option can only be used by root.\n");
+	exit(1);
+    }
+    xf86DoConfigure = TRUE;
+    xf86AllowMouseOpenFail = TRUE;
+    return 1;
+  }
+  if (!strcmp(argv[i], "-showopts"))
+  {
+    if (getuid() != 0 && geteuid() == 0) {
+    ErrorF("The '-showopts' option can only be used by root.\n");
+    exit(1);
+    }
+    xf86DoShowOptions = TRUE;
+    return 1;
+  }
+  if (!strcmp(argv[i], "-isolateDevice"))
+  {
+    CHECK_FOR_REQUIRED_ARGUMENT();
+    if (strncmp(argv[++i], "PCI:", 4)) {
+       FatalError("Bus types other than PCI not yet isolable\n");
+    }
+    xf86PciIsolateDevice(argv[i]);
+    return 2;
+  }
+  /* Notice cmdline xkbdir, but pass to dix as well */
+  if (!strcmp(argv[i], "-xkbdir"))
+  {
+    xf86xkbdirFlag = TRUE;
+    return 0;
+  }
+
+  /* OS-specific processing */
+  return xf86ProcessArgument(argc, argv, i);
+}
+
+/*
+ * ddxUseMsg --
+ *	Print out correct use of device dependent commandline options.
+ *      Maybe the user now knows what really to do ...
+ */
+
+void
+ddxUseMsg(void)
+{
+  ErrorF("\n");
+  ErrorF("\n");
+  ErrorF("Device Dependent Usage\n");
+  if (getuid() == 0 || geteuid() != 0)
+  {
+    ErrorF("-modulepath paths      specify the module search path\n");
+    ErrorF("-logfile file          specify a log file name\n");
+    ErrorF("-configure             probe for devices and write an "__XCONFIGFILE__"\n");
+    ErrorF("-showopts              print available options for all installed drivers\n");
+  }
+  ErrorF("-config file           specify a configuration file, relative to the\n");
+  ErrorF("                       "__XCONFIGFILE__" search path, only root can use absolute\n");
+  ErrorF("-configdir dir         specify a configuration directory, relative to the\n");
+  ErrorF("                       "__XCONFIGDIR__" search path, only root can use absolute\n");
+  ErrorF("-verbose [n]           verbose startup messages\n");
+  ErrorF("-logverbose [n]        verbose log messages\n");
+  ErrorF("-quiet                 minimal startup messages\n");
+  ErrorF("-pixmap24              use 24bpp pixmaps for depth 24\n");
+  ErrorF("-pixmap32              use 32bpp pixmaps for depth 24\n");
+  ErrorF("-fbbpp n               set bpp for the framebuffer. Default: 8\n");
+  ErrorF("-depth n               set colour depth. Default: 8\n");
+  ErrorF("-gamma f               set gamma value (0.1 < f < 10.0) Default: 1.0\n");
+  ErrorF("-rgamma f              set gamma value for red phase\n");
+  ErrorF("-ggamma f              set gamma value for green phase\n");
+  ErrorF("-bgamma f              set gamma value for blue phase\n");
+  ErrorF("-weight nnn            set RGB weighting at 16 bpp.  Default: 565\n");
+  ErrorF("-layout name           specify the ServerLayout section name\n");
+  ErrorF("-screen name           specify the Screen section name\n");
+  ErrorF("-keyboard name         specify the core keyboard InputDevice name\n");
+  ErrorF("-pointer name          specify the core pointer InputDevice name\n");
+  ErrorF("-nosilk                disable Silken Mouse\n");
+  ErrorF("-flipPixels            swap default black/white Pixel values\n");
+#ifdef XF86VIDMODE
+  ErrorF("-disableVidMode        disable mode adjustments with xvidtune\n");
+  ErrorF("-allowNonLocalXvidtune allow xvidtune to be run as a non-local client\n");
+#endif
+  ErrorF("-allowMouseOpenFail    start server even if the mouse can't be initialized\n");
+  ErrorF("-ignoreABI             make module ABI mismatches non-fatal\n");
+  ErrorF("-isolateDevice bus_id  restrict device resets to bus_id (PCI only)\n");
+  ErrorF("-version               show the server version\n");
+  ErrorF("-showDefaultModulePath show the server default module path\n");
+  ErrorF("-showDefaultLibPath    show the server default library path\n");
+  /* OS-specific usage */
+  xf86UseMsg();
+  ErrorF("\n");
+}
+
+
+/*
+ * xf86LoadModules iterates over a list that is being passed in.
+ */
+Bool
+xf86LoadModules(char **list, pointer *optlist)
+{
+    int errmaj, errmin;
+    pointer opt;
+    int i;
+    char *name;
+    Bool failed = FALSE;
+
+    if (!list)
+	return TRUE;
+
+    for (i = 0; list[i] != NULL; i++) {
+
+	/* Normalise the module name */
+	name = xf86NormalizeName(list[i]);
+
+	/* Skip empty names */
+	if (name == NULL || *name == '\0') {
+	    free(name);
+	    continue;
+	}
+
+	/* Replace obsolete keyboard driver with kbd */
+	if (!xf86NameCmp(name, "keyboard")) {
+	    strcpy(name, "kbd");
+	}
+
+	if (optlist)
+	    opt = optlist[i];
+	else
+	    opt = NULL;
+
+        if (!LoadModule(name, NULL, NULL, NULL, opt, NULL, &errmaj, &errmin)) {
+	    LoaderErrorMsg(NULL, name, errmaj, errmin);
+	    failed = TRUE;
+	}
+	free(name);
+    }
+    return !failed;
+}
+
+/* Pixmap format stuff */
+
+PixmapFormatPtr
+xf86GetPixFormat(ScrnInfoPtr pScrn, int depth)
+{
+    int i;
+    static PixmapFormatRec format;	/* XXX not reentrant */
+
+    /*
+     * When the formats[] list initialisation isn't complete, check the
+     * depth 24 pixmap config/cmdline options and screen-specified formats.
+     */
+
+    if (!formatsDone) {
+	if (depth == 24) {
+	    Pix24Flags pix24 = Pix24DontCare;
+
+	    format.depth = 24;
+	    format.scanlinePad = BITMAP_SCANLINE_PAD;
+	    if (xf86Info.pixmap24 != Pix24DontCare)
+		pix24 = xf86Info.pixmap24;
+	    else if (pScrn->pixmap24 != Pix24DontCare)
+		pix24 = pScrn->pixmap24;
+	    if (pix24 == Pix24Use24)
+		format.bitsPerPixel = 24;
+	    else
+		format.bitsPerPixel = 32;
+	    return &format;
+	}
+    }
+
+    for (i = 0; i < numFormats; i++)
+	if (formats[i].depth == depth)
+	   break;
+    if (i != numFormats)
+	return &formats[i];
+    else if (!formatsDone) {
+	/* Check for screen-specified formats */
+	for (i = 0; i < pScrn->numFormats; i++)
+	    if (pScrn->formats[i].depth == depth)
+		break;
+	if (i != pScrn->numFormats)
+	    return &pScrn->formats[i];
+    }
+    return NULL;
+}
+
+int
+xf86GetBppFromDepth(ScrnInfoPtr pScrn, int depth)
+{
+    PixmapFormatPtr format;
+
+
+    format = xf86GetPixFormat(pScrn, depth);
+    if (format)
+	return format->bitsPerPixel;
+    else
+	return 0;
+}
diff --git a/xorg-server/hw/xfree86/dri2/dri2.c b/xorg-server/hw/xfree86/dri2/dri2.c
index 7d6f772d7..10be59953 100644
--- a/xorg-server/hw/xfree86/dri2/dri2.c
+++ b/xorg-server/hw/xfree86/dri2/dri2.c
@@ -1,1227 +1,1232 @@
-/*

- * Copyright © 2007, 2008 Red Hat, Inc.

- *

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

- * copy of this software and associated documentation files (the "Soft-

- * ware"), to deal in the Software without restriction, including without

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

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

- * Software is furnished to do so, provided that the above copyright

- * notice(s) and this permission notice appear in all copies of the Soft-

- * ware and that both the above copyright notice(s) and this permission

- * notice appear in supporting documentation.

- *

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

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

- * ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY

- * RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN

- * THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSE-

- * QUENTIAL 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 PERFOR-

- * MANCE OF THIS SOFTWARE.

- *

- * Except as contained in this notice, the name of a copyright holder shall

- * not be used in advertising or otherwise to promote the sale, use or

- * other dealings in this Software without prior written authorization of

- * the copyright holder.

- *

- * Authors:

- *   Kristian Høgsberg (krh@redhat.com)

- */

-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include <errno.h>

-#ifdef WITH_LIBDRM

-#include <xf86drm.h>

-#endif

-#include "xf86Module.h"

-#include "list.h"

-#include "scrnintstr.h"

-#include "windowstr.h"

-#include "dixstruct.h"

-#include "dri2.h"

-#include "xf86VGAarbiter.h"

-

-#include "xf86.h"

-

-CARD8 dri2_major; /* version of DRI2 supported by DDX */

-CARD8 dri2_minor;

-

-static DevPrivateKeyRec dri2ScreenPrivateKeyRec;

-#define dri2ScreenPrivateKey (&dri2ScreenPrivateKeyRec)

-

-static DevPrivateKeyRec dri2WindowPrivateKeyRec;

-#define dri2WindowPrivateKey (&dri2WindowPrivateKeyRec)

-

-static DevPrivateKeyRec dri2PixmapPrivateKeyRec;

-#define dri2PixmapPrivateKey (&dri2PixmapPrivateKeyRec)

-

-static RESTYPE       dri2DrawableRes;

-

-typedef struct _DRI2Screen *DRI2ScreenPtr;

-

-typedef struct _DRI2Drawable {

-    DRI2ScreenPtr        dri2_screen;

-    DrawablePtr		 drawable;

-    struct list		 reference_list;

-    int			 width;

-    int			 height;

-    DRI2BufferPtr	*buffers;

-    int			 bufferCount;

-    unsigned int	 swapsPending;

-    ClientPtr		 blockedClient;

-    Bool		 blockedOnMsc;

-    int			 swap_interval;

-    CARD64		 swap_count;

-    int64_t		 target_sbc; /* -1 means no SBC wait outstanding */

-    CARD64		 last_swap_target; /* most recently queued swap target */

-    CARD64		 last_swap_msc; /* msc at completion of most recent swap */

-    CARD64		 last_swap_ust; /* ust at completion of most recent swap */

-    int			 swap_limit; /* for N-buffering */

-    unsigned long	 serialNumber;

-} DRI2DrawableRec, *DRI2DrawablePtr;

-

-typedef struct _DRI2Screen {

-    ScreenPtr			 screen;

-    int				 refcnt;

-    unsigned int		 numDrivers;

-    const char			**driverNames;

-    const char			*deviceName;

-    int				 fd;

-    unsigned int		 lastSequence;

-

-    DRI2CreateBufferProcPtr	 CreateBuffer;

-    DRI2DestroyBufferProcPtr	 DestroyBuffer;

-    DRI2CopyRegionProcPtr	 CopyRegion;

-    DRI2ScheduleSwapProcPtr	 ScheduleSwap;

-    DRI2GetMSCProcPtr		 GetMSC;

-    DRI2ScheduleWaitMSCProcPtr	 ScheduleWaitMSC;

-    DRI2AuthMagicProcPtr	 AuthMagic;

-

-    HandleExposuresProcPtr       HandleExposures;

-

-    ConfigNotifyProcPtr		 ConfigNotify;

-} DRI2ScreenRec;

-

-static DRI2ScreenPtr

-DRI2GetScreen(ScreenPtr pScreen)

-{

-    return dixLookupPrivate(&pScreen->devPrivates, dri2ScreenPrivateKey);

-}

-

-static DRI2DrawablePtr

-DRI2GetDrawable(DrawablePtr pDraw)

-{

-    WindowPtr pWin;

-    PixmapPtr pPixmap;

-

-    switch (pDraw->type) {

-    case DRAWABLE_WINDOW:

-	pWin = (WindowPtr) pDraw;

-	return dixLookupPrivate(&pWin->devPrivates, dri2WindowPrivateKey);

-    case DRAWABLE_PIXMAP:

-	pPixmap = (PixmapPtr) pDraw;

-	return dixLookupPrivate(&pPixmap->devPrivates, dri2PixmapPrivateKey);

-    default:

-	return NULL;

-    }

-}

-

-static unsigned long

-DRI2DrawableSerial(DrawablePtr pDraw)

-{

-    ScreenPtr pScreen = pDraw->pScreen;

-    PixmapPtr pPix;

-

-    if (pDraw->type != DRAWABLE_WINDOW)

-	return pDraw->serialNumber;

-

-    pPix = pScreen->GetWindowPixmap((WindowPtr)pDraw);

-    return pPix->drawable.serialNumber;

-}

-

-static DRI2DrawablePtr

-DRI2AllocateDrawable(DrawablePtr pDraw)

-{

-    DRI2ScreenPtr   ds = DRI2GetScreen(pDraw->pScreen);

-    DRI2DrawablePtr pPriv;

-    CARD64          ust;

-    WindowPtr pWin;

-    PixmapPtr pPixmap;

-

-    pPriv = malloc(sizeof *pPriv);

-    if (pPriv == NULL)

-	return NULL;

-

-    pPriv->dri2_screen = ds;

-    pPriv->drawable = pDraw;

-    pPriv->width = pDraw->width;

-    pPriv->height = pDraw->height;

-    pPriv->buffers = NULL;

-    pPriv->bufferCount = 0;

-    pPriv->swapsPending = 0;

-    pPriv->blockedClient = NULL;

-    pPriv->blockedOnMsc = FALSE;

-    pPriv->swap_count = 0;

-    pPriv->target_sbc = -1;

-    pPriv->swap_interval = 1;

-    /* Initialize last swap target from DDX if possible */

-    if (!ds->GetMSC || !(*ds->GetMSC)(pDraw, &ust, &pPriv->last_swap_target))

-	pPriv->last_swap_target = 0;

-

-    pPriv->swap_limit = 1; /* default to double buffering */

-    pPriv->last_swap_msc = 0;

-    pPriv->last_swap_ust = 0;

-    list_init(&pPriv->reference_list);

-    pPriv->serialNumber = DRI2DrawableSerial(pDraw);

-

-    if (pDraw->type == DRAWABLE_WINDOW) {

-	pWin = (WindowPtr) pDraw;

-	dixSetPrivate(&pWin->devPrivates, dri2WindowPrivateKey, pPriv);

-    } else {

-	pPixmap = (PixmapPtr) pDraw;

-	dixSetPrivate(&pPixmap->devPrivates, dri2PixmapPrivateKey, pPriv);

-    }

-

-    return pPriv;

-}

-

-typedef struct DRI2DrawableRefRec {

-    XID		  id;

-    XID		  dri2_id;

-    DRI2InvalidateProcPtr	invalidate;

-    void	 *priv;

-    struct list	  link;

-} DRI2DrawableRefRec, *DRI2DrawableRefPtr;

-

-static DRI2DrawableRefPtr

-DRI2LookupDrawableRef(DRI2DrawablePtr pPriv, XID id)

-{

-    DRI2DrawableRefPtr ref;

-

-    list_for_each_entry(ref, &pPriv->reference_list, link) {

-	if (ref->id == id)

-	    return ref;

-    }

-    

-    return NULL;

-}

-

-static int

-DRI2AddDrawableRef(DRI2DrawablePtr pPriv, XID id, XID dri2_id,

-		   DRI2InvalidateProcPtr invalidate, void *priv)

-{

-    DRI2DrawableRefPtr ref;

-

-    ref = malloc(sizeof *ref);

-    if (ref == NULL)

-	return BadAlloc;

-	

-    if (!AddResource(dri2_id, dri2DrawableRes, pPriv))

-	return BadAlloc;

-    if (!DRI2LookupDrawableRef(pPriv, id))

-	if (!AddResource(id, dri2DrawableRes, pPriv))

-	    return BadAlloc;

-

-    ref->id = id;

-    ref->dri2_id = dri2_id; 

-    ref->invalidate = invalidate;

-    ref->priv = priv;

-    list_add(&ref->link, &pPriv->reference_list);

-

-    return Success;

-}

-

-int

-DRI2CreateDrawable(ClientPtr client, DrawablePtr pDraw, XID id,

-		   DRI2InvalidateProcPtr invalidate, void *priv)

-{

-    DRI2DrawablePtr pPriv;

-    XID dri2_id;

-    int rc;

-

-    pPriv = DRI2GetDrawable(pDraw);

-    if (pPriv == NULL)

-	pPriv = DRI2AllocateDrawable(pDraw);

-    if (pPriv == NULL)

-	return BadAlloc;

-    

-    dri2_id = FakeClientID(client->index);

-    rc = DRI2AddDrawableRef(pPriv, id, dri2_id, invalidate, priv);

-    if (rc != Success)

-	return rc;

-

-    return Success;

-}

-

-static int DRI2DrawableGone(pointer p, XID id)

-{

-    DRI2DrawablePtr pPriv = p;

-    DRI2ScreenPtr   ds = pPriv->dri2_screen;

-    DRI2DrawableRefPtr ref, next;

-    WindowPtr pWin;

-    PixmapPtr pPixmap;

-    DrawablePtr pDraw;

-    int i;

-

-    list_for_each_entry_safe(ref, next, &pPriv->reference_list, link) {

-	if (ref->dri2_id == id) {

-	    list_del(&ref->link);

-	    /* If this was the last ref under this X drawable XID,

-	     * unregister the X drawable resource. */

-	    if (!DRI2LookupDrawableRef(pPriv, ref->id))

-		FreeResourceByType(ref->id, dri2DrawableRes, TRUE);

-	    free(ref);

-	    break;

-	}

-

-	if (ref->id == id) {

-	    list_del(&ref->link);

-	    FreeResourceByType(ref->dri2_id, dri2DrawableRes, TRUE);

-	    free(ref);

-	}

-    }

-

-    if (!list_is_empty(&pPriv->reference_list))

-	return Success;

-

-    pDraw = pPriv->drawable;

-    if (pDraw->type == DRAWABLE_WINDOW) {

-	pWin = (WindowPtr) pDraw;

-	dixSetPrivate(&pWin->devPrivates, dri2WindowPrivateKey, NULL);

-    } else {

-	pPixmap = (PixmapPtr) pDraw;

-	dixSetPrivate(&pPixmap->devPrivates, dri2PixmapPrivateKey, NULL);

-    }

-

-    if (pPriv->buffers != NULL) {

-	for (i = 0; i < pPriv->bufferCount; i++)

-	    (*ds->DestroyBuffer)(pDraw, pPriv->buffers[i]);

-

-	free(pPriv->buffers);

-    }

-

-    free(pPriv);

-

-    return Success;

-}

-

-static int

-find_attachment(DRI2DrawablePtr pPriv, unsigned attachment)

-{

-    int i;

-

-    if (pPriv->buffers == NULL) {

-	return -1;

-    }

-

-    for (i = 0; i < pPriv->bufferCount; i++) {

-	if ((pPriv->buffers[i] != NULL)

-	    && (pPriv->buffers[i]->attachment == attachment)) {

-	    return i;

-	}

-    }

-

-    return -1;

-}

-

-static Bool

-allocate_or_reuse_buffer(DrawablePtr pDraw, DRI2ScreenPtr ds,

-			 DRI2DrawablePtr pPriv,

-			 unsigned int attachment, unsigned int format,

-			 int dimensions_match, DRI2BufferPtr *buffer)

-{

-    int old_buf = find_attachment(pPriv, attachment);

-

-    if ((old_buf < 0)

-	|| !dimensions_match

-	|| (pPriv->buffers[old_buf]->format != format)) {

-	*buffer = (*ds->CreateBuffer)(pDraw, attachment, format);

-	pPriv->serialNumber = DRI2DrawableSerial(pDraw);

-	return TRUE;

-

-    } else {

-	*buffer = pPriv->buffers[old_buf];

-	pPriv->buffers[old_buf] = NULL;

-	return FALSE;

-    }

-}

-

-static void

-update_dri2_drawable_buffers(DRI2DrawablePtr pPriv, DrawablePtr pDraw,

-			     DRI2BufferPtr *buffers, int *out_count, int *width, int *height)

-{

-    DRI2ScreenPtr   ds = DRI2GetScreen(pDraw->pScreen);

-    int i;

-

-    if (pPriv->buffers != NULL) {

-	for (i = 0; i < pPriv->bufferCount; i++) {

-	    if (pPriv->buffers[i] != NULL) {

-		(*ds->DestroyBuffer)(pDraw, pPriv->buffers[i]);

-	    }

-	}

-

-	free(pPriv->buffers);

-    }

-

-    pPriv->buffers = buffers;

-    pPriv->bufferCount = *out_count;

-    pPriv->width = pDraw->width;

-    pPriv->height = pDraw->height;

-    *width = pPriv->width;

-    *height = pPriv->height;

-}

-

-static DRI2BufferPtr *

-do_get_buffers(DrawablePtr pDraw, int *width, int *height,

-	       unsigned int *attachments, int count, int *out_count,

-	       int has_format)

-{

-    DRI2ScreenPtr   ds = DRI2GetScreen(pDraw->pScreen);

-    DRI2DrawablePtr pPriv = DRI2GetDrawable(pDraw);

-    DRI2BufferPtr  *buffers;

-    int need_real_front = 0;

-    int need_fake_front = 0;

-    int have_fake_front = 0;

-    int front_format = 0;

-    int dimensions_match;

-    int buffers_changed = 0;

-    int i;

-

-    if (!pPriv) {

-	*width = pDraw->width;

-	*height = pDraw->height;

-	*out_count = 0;

-	return NULL;

-    }

-

-    dimensions_match = (pDraw->width == pPriv->width)

-	&& (pDraw->height == pPriv->height)

-	&& (pPriv->serialNumber == DRI2DrawableSerial(pDraw));

-

-    buffers = calloc((count + 1), sizeof(buffers[0]));

-

-    for (i = 0; i < count; i++) {

-	const unsigned attachment = *(attachments++);

-	const unsigned format = (has_format) ? *(attachments++) : 0;

-

-	if (allocate_or_reuse_buffer(pDraw, ds, pPriv, attachment,

-				     format, dimensions_match,

-				     &buffers[i]))

-		buffers_changed = 1;

-

-	if (buffers[i] == NULL)

-	    goto err_out;

-

-	/* If the drawable is a window and the front-buffer is requested,

-	 * silently add the fake front-buffer to the list of requested

-	 * attachments.  The counting logic in the loop accounts for the case

-	 * where the client requests both the fake and real front-buffer.

-	 */

-	if (attachment == DRI2BufferBackLeft) {

-	    need_real_front++;

-	    front_format = format;

-	}

-

-	if (attachment == DRI2BufferFrontLeft) {

-	    need_real_front--;

-	    front_format = format;

-

-	    if (pDraw->type == DRAWABLE_WINDOW) {

-		need_fake_front++;

-	    }

-	}

-

-	if (pDraw->type == DRAWABLE_WINDOW) {

-	    if (attachment == DRI2BufferFakeFrontLeft) {

-		need_fake_front--;

-		have_fake_front = 1;

-	    }

-	}

-    }

-

-    if (need_real_front > 0) {

-	if (allocate_or_reuse_buffer(pDraw, ds, pPriv, DRI2BufferFrontLeft,

-				     front_format, dimensions_match,

-				     &buffers[i]))

-	    buffers_changed = 1;

-

-	if (buffers[i] == NULL)

-	    goto err_out;

-	i++;

-    }

-

-    if (need_fake_front > 0) {

-	if (allocate_or_reuse_buffer(pDraw, ds, pPriv, DRI2BufferFakeFrontLeft,

-				     front_format, dimensions_match,

-				     &buffers[i]))

-	    buffers_changed = 1;

-

-	if (buffers[i] == NULL)

-	    goto err_out;

-

-	i++;

-	have_fake_front = 1;

-    }

-

-    *out_count = i;

-

-    update_dri2_drawable_buffers(pPriv, pDraw, buffers, out_count, width, height);

-

-    /* If the client is getting a fake front-buffer, pre-fill it with the

-     * contents of the real front-buffer.  This ensures correct operation of

-     * applications that call glXWaitX before calling glDrawBuffer.

-     */

-    if (have_fake_front && buffers_changed) {

-	BoxRec box;

-	RegionRec region;

-

-	box.x1 = 0;

-	box.y1 = 0;

-	box.x2 = pPriv->width;

-	box.y2 = pPriv->height;

-	RegionInit(&region, &box, 0);

-

-	DRI2CopyRegion(pDraw, &region, DRI2BufferFakeFrontLeft,

-		       DRI2BufferFrontLeft);

-    }

-

-    return pPriv->buffers;

-

-err_out:

-

-    *out_count = 0;

-

-    for (i = 0; i < count; i++) {

-	    if (buffers[i] != NULL)

-		    (*ds->DestroyBuffer)(pDraw, buffers[i]);

-    }

-

-    free(buffers);

-    buffers = NULL;

-

-    update_dri2_drawable_buffers(pPriv, pDraw, buffers, out_count, width, height);

-

-    return buffers;

-}

-

-DRI2BufferPtr *

-DRI2GetBuffers(DrawablePtr pDraw, int *width, int *height,

-	       unsigned int *attachments, int count, int *out_count)

-{

-    return do_get_buffers(pDraw, width, height, attachments, count,

-			  out_count, FALSE);

-}

-

-DRI2BufferPtr *

-DRI2GetBuffersWithFormat(DrawablePtr pDraw, int *width, int *height,

-			 unsigned int *attachments, int count, int *out_count)

-{

-    return do_get_buffers(pDraw, width, height, attachments, count,

-			  out_count, TRUE);

-}

-

-static void

-DRI2InvalidateDrawable(DrawablePtr pDraw)

-{

-    DRI2DrawablePtr pPriv = DRI2GetDrawable(pDraw);

-    DRI2DrawableRefPtr ref;

-

-    if (!pPriv)

-        return;

-

-    list_for_each_entry(ref, &pPriv->reference_list, link)

-	ref->invalidate(pDraw, ref->priv);

-}

-

-/*

- * In the direct rendered case, we throttle the clients that have more

- * than their share of outstanding swaps (and thus busy buffers) when a

- * new GetBuffers request is received.  In the AIGLX case, we allow the

- * client to get the new buffers, but throttle when the next GLX request

- * comes in (see __glXDRIcontextWait()).

- */

-Bool

-DRI2ThrottleClient(ClientPtr client, DrawablePtr pDraw)

-{

-    DRI2DrawablePtr pPriv;

-

-    pPriv = DRI2GetDrawable(pDraw);

-    if (pPriv == NULL)

-	return FALSE;

-

-    /* Throttle to swap limit */

-    if ((pPriv->swapsPending >= pPriv->swap_limit) &&

-	!pPriv->blockedClient) {

-	ResetCurrentRequest(client);

-	client->sequence--;

-	IgnoreClient(client);

-	pPriv->blockedClient = client;

-	return TRUE;

-    }

-

-    return FALSE;

-}

-

-static void

-__DRI2BlockClient(ClientPtr client, DRI2DrawablePtr pPriv)

-{

-    if (pPriv->blockedClient == NULL) {

-	IgnoreClient(client);

-	pPriv->blockedClient = client;

-    }

-}

-

-void

-DRI2BlockClient(ClientPtr client, DrawablePtr pDraw)

-{

-    DRI2DrawablePtr pPriv;

-

-    pPriv = DRI2GetDrawable(pDraw);

-    if (pPriv == NULL)

-	return;

-

-    __DRI2BlockClient(client, pPriv);

-    pPriv->blockedOnMsc = TRUE;

-}

-

-int

-DRI2CopyRegion(DrawablePtr pDraw, RegionPtr pRegion,

-	       unsigned int dest, unsigned int src)

-{

-    DRI2ScreenPtr   ds = DRI2GetScreen(pDraw->pScreen);

-    DRI2DrawablePtr pPriv;

-    DRI2BufferPtr   pDestBuffer, pSrcBuffer;

-    int		    i;

-

-    pPriv = DRI2GetDrawable(pDraw);

-    if (pPriv == NULL)

-	return BadDrawable;

-

-    pDestBuffer = NULL;

-    pSrcBuffer = NULL;

-    for (i = 0; i < pPriv->bufferCount; i++)

-    {

-	if (pPriv->buffers[i]->attachment == dest)

-	    pDestBuffer = (DRI2BufferPtr) pPriv->buffers[i];

-	if (pPriv->buffers[i]->attachment == src)

-	    pSrcBuffer = (DRI2BufferPtr) pPriv->buffers[i];

-    }

-    if (pSrcBuffer == NULL || pDestBuffer == NULL)

-	return BadValue;

-

-    (*ds->CopyRegion)(pDraw, pRegion, pDestBuffer, pSrcBuffer);

-

-    return Success;

-}

-

-/* Can this drawable be page flipped? */

-Bool

-DRI2CanFlip(DrawablePtr pDraw)

-{

-    ScreenPtr pScreen = pDraw->pScreen;

-    WindowPtr pWin, pRoot;

-    PixmapPtr pWinPixmap, pRootPixmap;

-

-    if (pDraw->type == DRAWABLE_PIXMAP)

-	return TRUE;

-

-    pRoot = pScreen->root;

-    pRootPixmap = pScreen->GetWindowPixmap(pRoot);

-

-    pWin = (WindowPtr) pDraw;

-    pWinPixmap = pScreen->GetWindowPixmap(pWin);

-    if (pRootPixmap != pWinPixmap)

-	return FALSE;

-    if (!RegionEqual(&pWin->clipList, &pRoot->winSize))

-	return FALSE;

-

-    /* Does the window match the pixmap exactly? */

-    if (pDraw->x != 0 ||

-	pDraw->y != 0 ||

-#ifdef COMPOSITE

-	pDraw->x != pWinPixmap->screen_x ||

-	pDraw->y != pWinPixmap->screen_y ||

-#endif

-	pDraw->width != pWinPixmap->drawable.width ||

-	pDraw->height != pWinPixmap->drawable.height)

-	return FALSE;

-

-    return TRUE;

-}

-

-/* Can we do a pixmap exchange instead of a blit? */

-Bool

-DRI2CanExchange(DrawablePtr pDraw)

-{

-    return FALSE;

-}

-

-void

-DRI2WaitMSCComplete(ClientPtr client, DrawablePtr pDraw, int frame,

-		    unsigned int tv_sec, unsigned int tv_usec)

-{

-    DRI2DrawablePtr pPriv;

-

-    pPriv = DRI2GetDrawable(pDraw);

-    if (pPriv == NULL)

-	return;

-

-    ProcDRI2WaitMSCReply(client, ((CARD64)tv_sec * 1000000) + tv_usec,

-			 frame, pPriv->swap_count);

-

-    if (pPriv->blockedClient)

-	AttendClient(pPriv->blockedClient);

-

-    pPriv->blockedClient = NULL;

-    pPriv->blockedOnMsc = FALSE;

-}

-

-static void

-DRI2WakeClient(ClientPtr client, DrawablePtr pDraw, int frame,

-	       unsigned int tv_sec, unsigned int tv_usec)

-{

-    ScreenPtr	    pScreen = pDraw->pScreen;

-    DRI2DrawablePtr pPriv;

-

-    pPriv = DRI2GetDrawable(pDraw);

-    if (pPriv == NULL) {

-        xf86DrvMsg(pScreen->myNum, X_ERROR,

-		   "[DRI2] %s: bad drawable\n", __func__);

-	return;

-    }

-

-    /*

-     * Swap completed.

-     * Wake the client iff:

-     *   - it was waiting on SBC

-     *   - was blocked due to GLX make current

-     *   - was blocked due to swap throttling

-     *   - is not blocked due to an MSC wait

-     */

-    if (pPriv->target_sbc != -1 &&

-	pPriv->target_sbc <= pPriv->swap_count) {

-	ProcDRI2WaitMSCReply(client, ((CARD64)tv_sec * 1000000) + tv_usec,

-			     frame, pPriv->swap_count);

-	pPriv->target_sbc = -1;

-

-	AttendClient(pPriv->blockedClient);

-	pPriv->blockedClient = NULL;

-    } else if (pPriv->target_sbc == -1 && !pPriv->blockedOnMsc) {

-	if (pPriv->blockedClient) {

-	    AttendClient(pPriv->blockedClient);

-	    pPriv->blockedClient = NULL;

-	}

-    }

-}

-

-void

-DRI2SwapComplete(ClientPtr client, DrawablePtr pDraw, int frame,

-		   unsigned int tv_sec, unsigned int tv_usec, int type,

-		   DRI2SwapEventPtr swap_complete, void *swap_data)

-{

-    ScreenPtr	    pScreen = pDraw->pScreen;

-    DRI2DrawablePtr pPriv;

-    CARD64          ust = 0;

-    BoxRec          box;

-    RegionRec       region;

-

-    pPriv = DRI2GetDrawable(pDraw);

-    if (pPriv == NULL) {

-        xf86DrvMsg(pScreen->myNum, X_ERROR,

-		   "[DRI2] %s: bad drawable\n", __func__);

-	return;

-    }

-

-    pPriv->swapsPending--;

-    pPriv->swap_count++;

-

-    box.x1 = 0;

-    box.y1 = 0;

-    box.x2 = pDraw->width;

-    box.y2 = pDraw->height;

-    RegionInit(&region, &box, 0);

-    DRI2CopyRegion(pDraw, &region, DRI2BufferFakeFrontLeft,

-		   DRI2BufferFrontLeft);

-

-    ust = ((CARD64)tv_sec * 1000000) + tv_usec;

-    if (swap_complete)

-	swap_complete(client, swap_data, type, ust, frame, pPriv->swap_count);

-

-    pPriv->last_swap_msc = frame;

-    pPriv->last_swap_ust = ust;

-

-    DRI2WakeClient(client, pDraw, frame, tv_sec, tv_usec);

-}

-

-Bool

-DRI2WaitSwap(ClientPtr client, DrawablePtr pDrawable)

-{

-    DRI2DrawablePtr pPriv = DRI2GetDrawable(pDrawable);

-

-    /* If we're currently waiting for a swap on this drawable, reset

-     * the request and suspend the client.  We only support one

-     * blocked client per drawable. */

-    if ((pPriv->swapsPending) &&

-	pPriv->blockedClient == NULL) {

-	ResetCurrentRequest(client);

-	client->sequence--;

-	__DRI2BlockClient(client, pPriv);

-	return TRUE;

-    }

-

-    return FALSE;

-}

-

-int

-DRI2SwapBuffers(ClientPtr client, DrawablePtr pDraw, CARD64 target_msc,

-		CARD64 divisor, CARD64 remainder, CARD64 *swap_target,

-		DRI2SwapEventPtr func, void *data)

-{

-    ScreenPtr       pScreen = pDraw->pScreen;

-    DRI2ScreenPtr   ds = DRI2GetScreen(pDraw->pScreen);

-    DRI2DrawablePtr pPriv;

-    DRI2BufferPtr   pDestBuffer = NULL, pSrcBuffer = NULL;

-    int             ret, i;

-    CARD64          ust, current_msc;

-

-    pPriv = DRI2GetDrawable(pDraw);

-    if (pPriv == NULL) {

-        xf86DrvMsg(pScreen->myNum, X_ERROR,

-		   "[DRI2] %s: bad drawable\n", __func__);

-	return BadDrawable;

-    }

-

-    for (i = 0; i < pPriv->bufferCount; i++) {

-	if (pPriv->buffers[i]->attachment == DRI2BufferFrontLeft)

-	    pDestBuffer = (DRI2BufferPtr) pPriv->buffers[i];

-	if (pPriv->buffers[i]->attachment == DRI2BufferBackLeft)

-	    pSrcBuffer = (DRI2BufferPtr) pPriv->buffers[i];

-    }

-    if (pSrcBuffer == NULL || pDestBuffer == NULL) {

-        xf86DrvMsg(pScreen->myNum, X_ERROR,

-		   "[DRI2] %s: drawable has no back or front?\n", __func__);

-	return BadDrawable;

-    }

-

-    /* Old DDX or no swap interval, just blit */

-    if (!ds->ScheduleSwap || !pPriv->swap_interval) {

-	BoxRec box;

-	RegionRec region;

-

-	box.x1 = 0;

-	box.y1 = 0;

-	box.x2 = pDraw->width;

-	box.y2 = pDraw->height;

-	RegionInit(&region, &box, 0);

-

-	pPriv->swapsPending++;

-

-	(*ds->CopyRegion)(pDraw, &region, pDestBuffer, pSrcBuffer);

-	DRI2SwapComplete(client, pDraw, target_msc, 0, 0, DRI2_BLIT_COMPLETE,

-			 func, data);

-	return Success;

-    }

-

-    /*

-     * In the simple glXSwapBuffers case, all params will be 0, and we just

-     * need to schedule a swap for the last swap target + the swap interval.

-     */

-    if (target_msc == 0 && divisor == 0 && remainder == 0) {

-	/* If the current vblank count of the drawable's crtc is lower

-	 * than the count stored in last_swap_target from a previous swap

-	 * then reinitialize last_swap_target to the current crtc's msc,

-	 * otherwise the swap will hang. This will happen if the drawable

-	 * is moved to a crtc with a lower refresh rate, or a crtc that just

-	 * got enabled.

-	 */

-	if (ds->GetMSC) {

-	    if (!(*ds->GetMSC)(pDraw, &ust, &current_msc))

-		pPriv->last_swap_target = 0;

-

-	    if (current_msc < pPriv->last_swap_target)

-		pPriv->last_swap_target = current_msc;

-

-	}

-

-	/*

-	 * Swap target for this swap is last swap target + swap interval since

-	 * we have to account for the current swap count, interval, and the

-	 * number of pending swaps.

-	 */

-	*swap_target = pPriv->last_swap_target + pPriv->swap_interval;

-

-    } else {

-	/* glXSwapBuffersMscOML could have a 0 target_msc, honor it */

-	*swap_target = target_msc;

-    }

-

-    pPriv->swapsPending++;

-    ret = (*ds->ScheduleSwap)(client, pDraw, pDestBuffer, pSrcBuffer,

-			      swap_target, divisor, remainder, func, data);

-    if (!ret) {

-	pPriv->swapsPending--; /* didn't schedule */

-        xf86DrvMsg(pScreen->myNum, X_ERROR,

-		   "[DRI2] %s: driver failed to schedule swap\n", __func__);

-	return BadDrawable;

-    }

-

-    pPriv->last_swap_target = *swap_target;

-

-    /* According to spec, return expected swapbuffers count SBC after this swap

-     * will complete.

-     */

-    *swap_target = pPriv->swap_count + pPriv->swapsPending;

-

-    DRI2InvalidateDrawable(pDraw);

-

-    return Success;

-}

-

-void

-DRI2SwapInterval(DrawablePtr pDrawable, int interval)

-{

-    ScreenPtr       pScreen = pDrawable->pScreen;

-    DRI2DrawablePtr pPriv = DRI2GetDrawable(pDrawable);

-

-    if (pPriv == NULL) {

-        xf86DrvMsg(pScreen->myNum, X_ERROR,

-		   "[DRI2] %s: bad drawable\n", __func__);

-	return;

-    }

-

-    /* fixme: check against arbitrary max? */

-    pPriv->swap_interval = interval;

-}

-

-int

-DRI2GetMSC(DrawablePtr pDraw, CARD64 *ust, CARD64 *msc, CARD64 *sbc)

-{

-    ScreenPtr pScreen = pDraw->pScreen;

-    DRI2ScreenPtr ds = DRI2GetScreen(pDraw->pScreen);

-    DRI2DrawablePtr pPriv;

-    Bool ret;

-

-    pPriv = DRI2GetDrawable(pDraw);

-    if (pPriv == NULL) {

-        xf86DrvMsg(pScreen->myNum, X_ERROR,

-		   "[DRI2] %s: bad drawable\n", __func__);

-	return BadDrawable;

-    }

-

-    if (!ds->GetMSC) {

-	*ust = 0;

-	*msc = 0;

-	*sbc = pPriv->swap_count;

-	return Success;

-    }

-

-    /*

-     * Spec needs to be updated to include unmapped or redirected

-     * drawables

-     */

-

-    ret = (*ds->GetMSC)(pDraw, ust, msc);

-    if (!ret)

-	return BadDrawable;

-

-    *sbc = pPriv->swap_count;

-

-    return Success;

-}

-

-int

-DRI2WaitMSC(ClientPtr client, DrawablePtr pDraw, CARD64 target_msc,

-	    CARD64 divisor, CARD64 remainder)

-{

-    DRI2ScreenPtr ds = DRI2GetScreen(pDraw->pScreen);

-    DRI2DrawablePtr pPriv;

-    Bool ret;

-

-    pPriv = DRI2GetDrawable(pDraw);

-    if (pPriv == NULL)

-	return BadDrawable;

-

-    /* Old DDX just completes immediately */

-    if (!ds->ScheduleWaitMSC) {

-	DRI2WaitMSCComplete(client, pDraw, target_msc, 0, 0);

-

-	return Success;

-    }

-

-    ret = (*ds->ScheduleWaitMSC)(client, pDraw, target_msc, divisor, remainder);

-    if (!ret)

-	return BadDrawable;

-

-    return Success;

-}

-

-int

-DRI2WaitSBC(ClientPtr client, DrawablePtr pDraw, CARD64 target_sbc)

-{

-    DRI2DrawablePtr pPriv;

-

-    pPriv = DRI2GetDrawable(pDraw);

-    if (pPriv == NULL)

-	return BadDrawable;

-

-    /* target_sbc == 0 means to block until all pending swaps are

-     * finished. Recalculate target_sbc to get that behaviour.

-     */

-    if (target_sbc == 0)

-        target_sbc = pPriv->swap_count + pPriv->swapsPending;

-

-    /* If current swap count already >= target_sbc, reply and

-     * return immediately with (ust, msc, sbc) triplet of

-     * most recent completed swap.

-     */

-    if (pPriv->swap_count >= target_sbc) {

-        ProcDRI2WaitMSCReply(client, pPriv->last_swap_ust,

-                             pPriv->last_swap_msc, pPriv->swap_count);

-        return Success;

-    }

-

-    pPriv->target_sbc = target_sbc;

-    __DRI2BlockClient(client, pPriv);

-

-    return Success;

-}

-

-Bool

-DRI2HasSwapControl(ScreenPtr pScreen)

-{

-    DRI2ScreenPtr ds = DRI2GetScreen(pScreen);

-

-    return ds->ScheduleSwap && ds->GetMSC;

-}

-

-Bool

-DRI2Connect(ScreenPtr pScreen, unsigned int driverType, int *fd,

-	    const char **driverName, const char **deviceName)

-{

-    DRI2ScreenPtr ds;

-

-    if (!dixPrivateKeyRegistered(dri2ScreenPrivateKey))

-	return FALSE;

-

-    ds = DRI2GetScreen(pScreen);

-    if (ds == NULL || driverType >= ds->numDrivers ||

-	    !ds->driverNames[driverType])

-	return FALSE;

-

-    *fd = ds->fd;

-    *driverName = ds->driverNames[driverType];

-    *deviceName = ds->deviceName;

-

-    return TRUE;

-}

-

-Bool

-DRI2Authenticate(ScreenPtr pScreen, uint32_t magic)

-{

-    DRI2ScreenPtr ds = DRI2GetScreen(pScreen);

-

-    if (ds == NULL || (*ds->AuthMagic)(ds->fd, magic))

-        return FALSE;

-

-    return TRUE;

-}

-

-static int

-DRI2ConfigNotify(WindowPtr pWin, int x, int y, int w, int h, int bw,

-		 WindowPtr pSib)

-{

-    DrawablePtr pDraw = (DrawablePtr)pWin;

-    ScreenPtr pScreen = pDraw->pScreen;

-    DRI2ScreenPtr ds = DRI2GetScreen(pScreen);

-    DRI2DrawablePtr dd = DRI2GetDrawable(pDraw);

-    int ret;

-

-    if (ds->ConfigNotify) {

-	pScreen->ConfigNotify = ds->ConfigNotify;

-

-	ret = (*pScreen->ConfigNotify)(pWin, x, y, w, h, bw, pSib);

-

-	ds->ConfigNotify = pScreen->ConfigNotify;

-	pScreen->ConfigNotify = DRI2ConfigNotify;

-	if (ret)

-	    return ret;

-    }

-

-    if (!dd || (dd->width == w && dd->height == h))

-	return Success;

-

-    DRI2InvalidateDrawable(pDraw);

-    return Success;

-}

-

-Bool

-DRI2ScreenInit(ScreenPtr pScreen, DRI2InfoPtr info)

-{

-    DRI2ScreenPtr ds;

-    const char* driverTypeNames[] = {

-	"DRI", /* DRI2DriverDRI */

-	"VDPAU", /* DRI2DriverVDPAU */

-    };

-    unsigned int i;

-    CARD8 cur_minor;

-

-    if (info->version < 3)

-	return FALSE;

-

-    if (!xf86VGAarbiterAllowDRI(pScreen)) {

-        xf86DrvMsg(pScreen->myNum, X_WARNING,

-                  "[DRI2] Direct rendering is not supported when VGA arb is necessary for the device\n");

-        return FALSE;

-    }

-

-    if (!dixRegisterPrivateKey(&dri2ScreenPrivateKeyRec, PRIVATE_SCREEN, 0))

-	return FALSE;

-

-    if (!dixRegisterPrivateKey(&dri2WindowPrivateKeyRec, PRIVATE_WINDOW, 0))

-	return FALSE;

-

-    if (!dixRegisterPrivateKey(&dri2PixmapPrivateKeyRec, PRIVATE_PIXMAP, 0))

-	return FALSE;

-

-    ds = calloc(1, sizeof *ds);

-    if (!ds)

-	return FALSE;

-

-    ds->screen         = pScreen;

-    ds->fd	       = info->fd;

-    ds->deviceName     = info->deviceName;

-    dri2_major         = 1;

-

-    ds->CreateBuffer   = info->CreateBuffer;

-    ds->DestroyBuffer  = info->DestroyBuffer;

-    ds->CopyRegion     = info->CopyRegion;

-

-    if (info->version >= 4) {

-	ds->ScheduleSwap = info->ScheduleSwap;

-	ds->ScheduleWaitMSC = info->ScheduleWaitMSC;

-	ds->GetMSC = info->GetMSC;

-	cur_minor = 3;

-    } else {

-	cur_minor = 1;

-    }

-

-    if (info->version >= 5) {

-        ds->AuthMagic = info->AuthMagic;

-    }

-

-    /*

-     * if the driver doesn't provide an AuthMagic function or the info struct

-     * version is too low, it relies on the old method (using libdrm) or fail

-     */

-    if (!ds->AuthMagic)

-#ifdef WITH_LIBDRM

-        ds->AuthMagic = drmAuthMagic;

-#else

-        goto err_out;

-#endif

-

-    /* Initialize minor if needed and set to minimum provied by DDX */

-    if (!dri2_minor || dri2_minor > cur_minor)

-	dri2_minor = cur_minor;

-

-    if (info->version == 3 || info->numDrivers == 0) {

-	/* Driver too old: use the old-style driverName field */

-	ds->numDrivers = 1;

-	ds->driverNames = malloc(sizeof(*ds->driverNames));

-	if (!ds->driverNames)

-	    goto err_out;

-	ds->driverNames[0] = info->driverName;

-    } else {

-	ds->numDrivers = info->numDrivers;

-	ds->driverNames = malloc(info->numDrivers * sizeof(*ds->driverNames));

-	if (!ds->driverNames)

-		goto err_out;

-	memcpy(ds->driverNames, info->driverNames,

-	       info->numDrivers * sizeof(*ds->driverNames));

-    }

-

-    dixSetPrivate(&pScreen->devPrivates, dri2ScreenPrivateKey, ds);

-

-    ds->ConfigNotify = pScreen->ConfigNotify;

-    pScreen->ConfigNotify = DRI2ConfigNotify;

-

-    xf86DrvMsg(pScreen->myNum, X_INFO, "[DRI2] Setup complete\n");

-    for (i = 0; i < sizeof(driverTypeNames) / sizeof(driverTypeNames[0]); i++) {

-	if (i < ds->numDrivers && ds->driverNames[i]) {

-	    xf86DrvMsg(pScreen->myNum, X_INFO, "[DRI2]   %s driver: %s\n",

-		       driverTypeNames[i], ds->driverNames[i]);

-	}

-    }

-

-    return TRUE;

-

-err_out:

-    xf86DrvMsg(pScreen->myNum, X_WARNING,

-            "[DRI2] Initialization failed for info version %d.\n", info->version);

-    free(ds);

-    return FALSE;

-}

-

-void

-DRI2CloseScreen(ScreenPtr pScreen)

-{

-    DRI2ScreenPtr ds = DRI2GetScreen(pScreen);

-

-    free(ds->driverNames);

-    free(ds);

-    dixSetPrivate(&pScreen->devPrivates, dri2ScreenPrivateKey, NULL);

-}

-

-extern ExtensionModule dri2ExtensionModule;

-

-static pointer

-DRI2Setup(pointer module, pointer opts, int *errmaj, int *errmin)

-{

-    static Bool setupDone = FALSE;

-

-    dri2DrawableRes = CreateNewResourceType(DRI2DrawableGone, "DRI2Drawable");

-

-    if (!setupDone)

-    {

-	setupDone = TRUE;

-	LoadExtension(&dri2ExtensionModule, FALSE);

-    }

-    else

-    {

-	if (errmaj)

-	    *errmaj = LDR_ONCEONLY;

-    }

-

-    return (pointer) 1;

-}

-

-static XF86ModuleVersionInfo DRI2VersRec =

-{

-    "dri2",

-    MODULEVENDORSTRING,

-    MODINFOSTRING1,

-    MODINFOSTRING2,

-    XORG_VERSION_CURRENT,

-    1, 2, 0,

-    ABI_CLASS_EXTENSION,

-    ABI_EXTENSION_VERSION,

-    MOD_CLASS_NONE,

-    { 0, 0, 0, 0 }

-};

-

-_X_EXPORT XF86ModuleData dri2ModuleData = { &DRI2VersRec, DRI2Setup, NULL };

-

-void

-DRI2Version(int *major, int *minor)

-{

-    if (major != NULL)

-	*major = DRI2VersRec.majorversion;

-

-    if (minor != NULL)

-	*minor = DRI2VersRec.minorversion;

-}

+/*
+ * Copyright © 2007, 2008 Red Hat, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Soft-
+ * ware"), to deal in the Software without restriction, including without
+ * limitation the rights to use, copy, modify, merge, publish, distribute,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, provided that the above copyright
+ * notice(s) and this permission notice appear in all copies of the Soft-
+ * ware and that both the above copyright notice(s) and this permission
+ * notice appear in supporting documentation.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL-
+ * ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY
+ * RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN
+ * THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSE-
+ * QUENTIAL 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 PERFOR-
+ * MANCE OF THIS SOFTWARE.
+ *
+ * Except as contained in this notice, the name of a copyright holder shall
+ * not be used in advertising or otherwise to promote the sale, use or
+ * other dealings in this Software without prior written authorization of
+ * the copyright holder.
+ *
+ * Authors:
+ *   Kristian Høgsberg (krh@redhat.com)
+ */
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include <errno.h>
+#ifdef WITH_LIBDRM
+#include <xf86drm.h>
+#endif
+#include "xf86Module.h"
+#include "list.h"
+#include "scrnintstr.h"
+#include "windowstr.h"
+#include "dixstruct.h"
+#include "dri2.h"
+#include "xf86VGAarbiter.h"
+
+#include "xf86.h"
+
+CARD8 dri2_major; /* version of DRI2 supported by DDX */
+CARD8 dri2_minor;
+
+static DevPrivateKeyRec dri2ScreenPrivateKeyRec;
+#define dri2ScreenPrivateKey (&dri2ScreenPrivateKeyRec)
+
+static DevPrivateKeyRec dri2WindowPrivateKeyRec;
+#define dri2WindowPrivateKey (&dri2WindowPrivateKeyRec)
+
+static DevPrivateKeyRec dri2PixmapPrivateKeyRec;
+#define dri2PixmapPrivateKey (&dri2PixmapPrivateKeyRec)
+
+static RESTYPE       dri2DrawableRes;
+
+typedef struct _DRI2Screen *DRI2ScreenPtr;
+
+typedef struct _DRI2Drawable {
+    DRI2ScreenPtr        dri2_screen;
+    DrawablePtr		 drawable;
+    struct list		 reference_list;
+    int			 width;
+    int			 height;
+    DRI2BufferPtr	*buffers;
+    int			 bufferCount;
+    unsigned int	 swapsPending;
+    ClientPtr		 blockedClient;
+    Bool		 blockedOnMsc;
+    int			 swap_interval;
+    CARD64		 swap_count;
+    int64_t		 target_sbc; /* -1 means no SBC wait outstanding */
+    CARD64		 last_swap_target; /* most recently queued swap target */
+    CARD64		 last_swap_msc; /* msc at completion of most recent swap */
+    CARD64		 last_swap_ust; /* ust at completion of most recent swap */
+    int			 swap_limit; /* for N-buffering */
+    unsigned long	 serialNumber;
+} DRI2DrawableRec, *DRI2DrawablePtr;
+
+typedef struct _DRI2Screen {
+    ScreenPtr			 screen;
+    int				 refcnt;
+    unsigned int		 numDrivers;
+    const char			**driverNames;
+    const char			*deviceName;
+    int				 fd;
+    unsigned int		 lastSequence;
+
+    DRI2CreateBufferProcPtr	 CreateBuffer;
+    DRI2DestroyBufferProcPtr	 DestroyBuffer;
+    DRI2CopyRegionProcPtr	 CopyRegion;
+    DRI2ScheduleSwapProcPtr	 ScheduleSwap;
+    DRI2GetMSCProcPtr		 GetMSC;
+    DRI2ScheduleWaitMSCProcPtr	 ScheduleWaitMSC;
+    DRI2AuthMagicProcPtr	 AuthMagic;
+
+    HandleExposuresProcPtr       HandleExposures;
+
+    ConfigNotifyProcPtr		 ConfigNotify;
+} DRI2ScreenRec;
+
+static DRI2ScreenPtr
+DRI2GetScreen(ScreenPtr pScreen)
+{
+    return dixLookupPrivate(&pScreen->devPrivates, dri2ScreenPrivateKey);
+}
+
+static DRI2DrawablePtr
+DRI2GetDrawable(DrawablePtr pDraw)
+{
+    WindowPtr pWin;
+    PixmapPtr pPixmap;
+
+    switch (pDraw->type) {
+    case DRAWABLE_WINDOW:
+	pWin = (WindowPtr) pDraw;
+	return dixLookupPrivate(&pWin->devPrivates, dri2WindowPrivateKey);
+    case DRAWABLE_PIXMAP:
+	pPixmap = (PixmapPtr) pDraw;
+	return dixLookupPrivate(&pPixmap->devPrivates, dri2PixmapPrivateKey);
+    default:
+	return NULL;
+    }
+}
+
+static unsigned long
+DRI2DrawableSerial(DrawablePtr pDraw)
+{
+    ScreenPtr pScreen = pDraw->pScreen;
+    PixmapPtr pPix;
+
+    if (pDraw->type != DRAWABLE_WINDOW)
+	return pDraw->serialNumber;
+
+    pPix = pScreen->GetWindowPixmap((WindowPtr)pDraw);
+    return pPix->drawable.serialNumber;
+}
+
+static DRI2DrawablePtr
+DRI2AllocateDrawable(DrawablePtr pDraw)
+{
+    DRI2ScreenPtr   ds = DRI2GetScreen(pDraw->pScreen);
+    DRI2DrawablePtr pPriv;
+    CARD64          ust;
+    WindowPtr pWin;
+    PixmapPtr pPixmap;
+
+    pPriv = malloc(sizeof *pPriv);
+    if (pPriv == NULL)
+	return NULL;
+
+    pPriv->dri2_screen = ds;
+    pPriv->drawable = pDraw;
+    pPriv->width = pDraw->width;
+    pPriv->height = pDraw->height;
+    pPriv->buffers = NULL;
+    pPriv->bufferCount = 0;
+    pPriv->swapsPending = 0;
+    pPriv->blockedClient = NULL;
+    pPriv->blockedOnMsc = FALSE;
+    pPriv->swap_count = 0;
+    pPriv->target_sbc = -1;
+    pPriv->swap_interval = 1;
+    /* Initialize last swap target from DDX if possible */
+    if (!ds->GetMSC || !(*ds->GetMSC)(pDraw, &ust, &pPriv->last_swap_target))
+	pPriv->last_swap_target = 0;
+
+    pPriv->swap_limit = 1; /* default to double buffering */
+    pPriv->last_swap_msc = 0;
+    pPriv->last_swap_ust = 0;
+    list_init(&pPriv->reference_list);
+    pPriv->serialNumber = DRI2DrawableSerial(pDraw);
+
+    if (pDraw->type == DRAWABLE_WINDOW) {
+	pWin = (WindowPtr) pDraw;
+	dixSetPrivate(&pWin->devPrivates, dri2WindowPrivateKey, pPriv);
+    } else {
+	pPixmap = (PixmapPtr) pDraw;
+	dixSetPrivate(&pPixmap->devPrivates, dri2PixmapPrivateKey, pPriv);
+    }
+
+    return pPriv;
+}
+
+typedef struct DRI2DrawableRefRec {
+    XID		  id;
+    XID		  dri2_id;
+    DRI2InvalidateProcPtr	invalidate;
+    void	 *priv;
+    struct list	  link;
+} DRI2DrawableRefRec, *DRI2DrawableRefPtr;
+
+static DRI2DrawableRefPtr
+DRI2LookupDrawableRef(DRI2DrawablePtr pPriv, XID id)
+{
+    DRI2DrawableRefPtr ref;
+
+    list_for_each_entry(ref, &pPriv->reference_list, link) {
+	if (ref->id == id)
+	    return ref;
+    }
+    
+    return NULL;
+}
+
+static int
+DRI2AddDrawableRef(DRI2DrawablePtr pPriv, XID id, XID dri2_id,
+		   DRI2InvalidateProcPtr invalidate, void *priv)
+{
+    DRI2DrawableRefPtr ref;
+
+    ref = malloc(sizeof *ref);
+    if (ref == NULL)
+	return BadAlloc;
+	
+    if (!AddResource(dri2_id, dri2DrawableRes, pPriv)) {
+	free(ref);
+	return BadAlloc;
+    }
+    if (!DRI2LookupDrawableRef(pPriv, id))
+	if (!AddResource(id, dri2DrawableRes, pPriv)) {
+	    FreeResourceByType(dri2_id, dri2DrawableRes, TRUE);
+	    free(ref);
+	    return BadAlloc;
+        }
+
+    ref->id = id;
+    ref->dri2_id = dri2_id; 
+    ref->invalidate = invalidate;
+    ref->priv = priv;
+    list_add(&ref->link, &pPriv->reference_list);
+
+    return Success;
+}
+
+int
+DRI2CreateDrawable(ClientPtr client, DrawablePtr pDraw, XID id,
+		   DRI2InvalidateProcPtr invalidate, void *priv)
+{
+    DRI2DrawablePtr pPriv;
+    XID dri2_id;
+    int rc;
+
+    pPriv = DRI2GetDrawable(pDraw);
+    if (pPriv == NULL)
+	pPriv = DRI2AllocateDrawable(pDraw);
+    if (pPriv == NULL)
+	return BadAlloc;
+    
+    dri2_id = FakeClientID(client->index);
+    rc = DRI2AddDrawableRef(pPriv, id, dri2_id, invalidate, priv);
+    if (rc != Success)
+	return rc;
+
+    return Success;
+}
+
+static int DRI2DrawableGone(pointer p, XID id)
+{
+    DRI2DrawablePtr pPriv = p;
+    DRI2ScreenPtr   ds = pPriv->dri2_screen;
+    DRI2DrawableRefPtr ref, next;
+    WindowPtr pWin;
+    PixmapPtr pPixmap;
+    DrawablePtr pDraw;
+    int i;
+
+    list_for_each_entry_safe(ref, next, &pPriv->reference_list, link) {
+	if (ref->dri2_id == id) {
+	    list_del(&ref->link);
+	    /* If this was the last ref under this X drawable XID,
+	     * unregister the X drawable resource. */
+	    if (!DRI2LookupDrawableRef(pPriv, ref->id))
+		FreeResourceByType(ref->id, dri2DrawableRes, TRUE);
+	    free(ref);
+	    break;
+	}
+
+	if (ref->id == id) {
+	    list_del(&ref->link);
+	    FreeResourceByType(ref->dri2_id, dri2DrawableRes, TRUE);
+	    free(ref);
+	}
+    }
+
+    if (!list_is_empty(&pPriv->reference_list))
+	return Success;
+
+    pDraw = pPriv->drawable;
+    if (pDraw->type == DRAWABLE_WINDOW) {
+	pWin = (WindowPtr) pDraw;
+	dixSetPrivate(&pWin->devPrivates, dri2WindowPrivateKey, NULL);
+    } else {
+	pPixmap = (PixmapPtr) pDraw;
+	dixSetPrivate(&pPixmap->devPrivates, dri2PixmapPrivateKey, NULL);
+    }
+
+    if (pPriv->buffers != NULL) {
+	for (i = 0; i < pPriv->bufferCount; i++)
+	    (*ds->DestroyBuffer)(pDraw, pPriv->buffers[i]);
+
+	free(pPriv->buffers);
+    }
+
+    free(pPriv);
+
+    return Success;
+}
+
+static int
+find_attachment(DRI2DrawablePtr pPriv, unsigned attachment)
+{
+    int i;
+
+    if (pPriv->buffers == NULL) {
+	return -1;
+    }
+
+    for (i = 0; i < pPriv->bufferCount; i++) {
+	if ((pPriv->buffers[i] != NULL)
+	    && (pPriv->buffers[i]->attachment == attachment)) {
+	    return i;
+	}
+    }
+
+    return -1;
+}
+
+static Bool
+allocate_or_reuse_buffer(DrawablePtr pDraw, DRI2ScreenPtr ds,
+			 DRI2DrawablePtr pPriv,
+			 unsigned int attachment, unsigned int format,
+			 int dimensions_match, DRI2BufferPtr *buffer)
+{
+    int old_buf = find_attachment(pPriv, attachment);
+
+    if ((old_buf < 0)
+	|| !dimensions_match
+	|| (pPriv->buffers[old_buf]->format != format)) {
+	*buffer = (*ds->CreateBuffer)(pDraw, attachment, format);
+	pPriv->serialNumber = DRI2DrawableSerial(pDraw);
+	return TRUE;
+
+    } else {
+	*buffer = pPriv->buffers[old_buf];
+	pPriv->buffers[old_buf] = NULL;
+	return FALSE;
+    }
+}
+
+static void
+update_dri2_drawable_buffers(DRI2DrawablePtr pPriv, DrawablePtr pDraw,
+			     DRI2BufferPtr *buffers, int *out_count, int *width, int *height)
+{
+    DRI2ScreenPtr   ds = DRI2GetScreen(pDraw->pScreen);
+    int i;
+
+    if (pPriv->buffers != NULL) {
+	for (i = 0; i < pPriv->bufferCount; i++) {
+	    if (pPriv->buffers[i] != NULL) {
+		(*ds->DestroyBuffer)(pDraw, pPriv->buffers[i]);
+	    }
+	}
+
+	free(pPriv->buffers);
+    }
+
+    pPriv->buffers = buffers;
+    pPriv->bufferCount = *out_count;
+    pPriv->width = pDraw->width;
+    pPriv->height = pDraw->height;
+    *width = pPriv->width;
+    *height = pPriv->height;
+}
+
+static DRI2BufferPtr *
+do_get_buffers(DrawablePtr pDraw, int *width, int *height,
+	       unsigned int *attachments, int count, int *out_count,
+	       int has_format)
+{
+    DRI2ScreenPtr   ds = DRI2GetScreen(pDraw->pScreen);
+    DRI2DrawablePtr pPriv = DRI2GetDrawable(pDraw);
+    DRI2BufferPtr  *buffers;
+    int need_real_front = 0;
+    int need_fake_front = 0;
+    int have_fake_front = 0;
+    int front_format = 0;
+    int dimensions_match;
+    int buffers_changed = 0;
+    int i;
+
+    if (!pPriv) {
+	*width = pDraw->width;
+	*height = pDraw->height;
+	*out_count = 0;
+	return NULL;
+    }
+
+    dimensions_match = (pDraw->width == pPriv->width)
+	&& (pDraw->height == pPriv->height)
+	&& (pPriv->serialNumber == DRI2DrawableSerial(pDraw));
+
+    buffers = calloc((count + 1), sizeof(buffers[0]));
+
+    for (i = 0; i < count; i++) {
+	const unsigned attachment = *(attachments++);
+	const unsigned format = (has_format) ? *(attachments++) : 0;
+
+	if (allocate_or_reuse_buffer(pDraw, ds, pPriv, attachment,
+				     format, dimensions_match,
+				     &buffers[i]))
+		buffers_changed = 1;
+
+	if (buffers[i] == NULL)
+	    goto err_out;
+
+	/* If the drawable is a window and the front-buffer is requested,
+	 * silently add the fake front-buffer to the list of requested
+	 * attachments.  The counting logic in the loop accounts for the case
+	 * where the client requests both the fake and real front-buffer.
+	 */
+	if (attachment == DRI2BufferBackLeft) {
+	    need_real_front++;
+	    front_format = format;
+	}
+
+	if (attachment == DRI2BufferFrontLeft) {
+	    need_real_front--;
+	    front_format = format;
+
+	    if (pDraw->type == DRAWABLE_WINDOW) {
+		need_fake_front++;
+	    }
+	}
+
+	if (pDraw->type == DRAWABLE_WINDOW) {
+	    if (attachment == DRI2BufferFakeFrontLeft) {
+		need_fake_front--;
+		have_fake_front = 1;
+	    }
+	}
+    }
+
+    if (need_real_front > 0) {
+	if (allocate_or_reuse_buffer(pDraw, ds, pPriv, DRI2BufferFrontLeft,
+				     front_format, dimensions_match,
+				     &buffers[i]))
+	    buffers_changed = 1;
+
+	if (buffers[i] == NULL)
+	    goto err_out;
+	i++;
+    }
+
+    if (need_fake_front > 0) {
+	if (allocate_or_reuse_buffer(pDraw, ds, pPriv, DRI2BufferFakeFrontLeft,
+				     front_format, dimensions_match,
+				     &buffers[i]))
+	    buffers_changed = 1;
+
+	if (buffers[i] == NULL)
+	    goto err_out;
+
+	i++;
+	have_fake_front = 1;
+    }
+
+    *out_count = i;
+
+    update_dri2_drawable_buffers(pPriv, pDraw, buffers, out_count, width, height);
+
+    /* If the client is getting a fake front-buffer, pre-fill it with the
+     * contents of the real front-buffer.  This ensures correct operation of
+     * applications that call glXWaitX before calling glDrawBuffer.
+     */
+    if (have_fake_front && buffers_changed) {
+	BoxRec box;
+	RegionRec region;
+
+	box.x1 = 0;
+	box.y1 = 0;
+	box.x2 = pPriv->width;
+	box.y2 = pPriv->height;
+	RegionInit(&region, &box, 0);
+
+	DRI2CopyRegion(pDraw, &region, DRI2BufferFakeFrontLeft,
+		       DRI2BufferFrontLeft);
+    }
+
+    return pPriv->buffers;
+
+err_out:
+
+    *out_count = 0;
+
+    for (i = 0; i < count; i++) {
+	    if (buffers[i] != NULL)
+		    (*ds->DestroyBuffer)(pDraw, buffers[i]);
+    }
+
+    free(buffers);
+    buffers = NULL;
+
+    update_dri2_drawable_buffers(pPriv, pDraw, buffers, out_count, width, height);
+
+    return buffers;
+}
+
+DRI2BufferPtr *
+DRI2GetBuffers(DrawablePtr pDraw, int *width, int *height,
+	       unsigned int *attachments, int count, int *out_count)
+{
+    return do_get_buffers(pDraw, width, height, attachments, count,
+			  out_count, FALSE);
+}
+
+DRI2BufferPtr *
+DRI2GetBuffersWithFormat(DrawablePtr pDraw, int *width, int *height,
+			 unsigned int *attachments, int count, int *out_count)
+{
+    return do_get_buffers(pDraw, width, height, attachments, count,
+			  out_count, TRUE);
+}
+
+static void
+DRI2InvalidateDrawable(DrawablePtr pDraw)
+{
+    DRI2DrawablePtr pPriv = DRI2GetDrawable(pDraw);
+    DRI2DrawableRefPtr ref;
+
+    if (!pPriv)
+        return;
+
+    list_for_each_entry(ref, &pPriv->reference_list, link)
+	ref->invalidate(pDraw, ref->priv);
+}
+
+/*
+ * In the direct rendered case, we throttle the clients that have more
+ * than their share of outstanding swaps (and thus busy buffers) when a
+ * new GetBuffers request is received.  In the AIGLX case, we allow the
+ * client to get the new buffers, but throttle when the next GLX request
+ * comes in (see __glXDRIcontextWait()).
+ */
+Bool
+DRI2ThrottleClient(ClientPtr client, DrawablePtr pDraw)
+{
+    DRI2DrawablePtr pPriv;
+
+    pPriv = DRI2GetDrawable(pDraw);
+    if (pPriv == NULL)
+	return FALSE;
+
+    /* Throttle to swap limit */
+    if ((pPriv->swapsPending >= pPriv->swap_limit) &&
+	!pPriv->blockedClient) {
+	ResetCurrentRequest(client);
+	client->sequence--;
+	IgnoreClient(client);
+	pPriv->blockedClient = client;
+	return TRUE;
+    }
+
+    return FALSE;
+}
+
+static void
+__DRI2BlockClient(ClientPtr client, DRI2DrawablePtr pPriv)
+{
+    if (pPriv->blockedClient == NULL) {
+	IgnoreClient(client);
+	pPriv->blockedClient = client;
+    }
+}
+
+void
+DRI2BlockClient(ClientPtr client, DrawablePtr pDraw)
+{
+    DRI2DrawablePtr pPriv;
+
+    pPriv = DRI2GetDrawable(pDraw);
+    if (pPriv == NULL)
+	return;
+
+    __DRI2BlockClient(client, pPriv);
+    pPriv->blockedOnMsc = TRUE;
+}
+
+int
+DRI2CopyRegion(DrawablePtr pDraw, RegionPtr pRegion,
+	       unsigned int dest, unsigned int src)
+{
+    DRI2ScreenPtr   ds = DRI2GetScreen(pDraw->pScreen);
+    DRI2DrawablePtr pPriv;
+    DRI2BufferPtr   pDestBuffer, pSrcBuffer;
+    int		    i;
+
+    pPriv = DRI2GetDrawable(pDraw);
+    if (pPriv == NULL)
+	return BadDrawable;
+
+    pDestBuffer = NULL;
+    pSrcBuffer = NULL;
+    for (i = 0; i < pPriv->bufferCount; i++)
+    {
+	if (pPriv->buffers[i]->attachment == dest)
+	    pDestBuffer = (DRI2BufferPtr) pPriv->buffers[i];
+	if (pPriv->buffers[i]->attachment == src)
+	    pSrcBuffer = (DRI2BufferPtr) pPriv->buffers[i];
+    }
+    if (pSrcBuffer == NULL || pDestBuffer == NULL)
+	return BadValue;
+
+    (*ds->CopyRegion)(pDraw, pRegion, pDestBuffer, pSrcBuffer);
+
+    return Success;
+}
+
+/* Can this drawable be page flipped? */
+Bool
+DRI2CanFlip(DrawablePtr pDraw)
+{
+    ScreenPtr pScreen = pDraw->pScreen;
+    WindowPtr pWin, pRoot;
+    PixmapPtr pWinPixmap, pRootPixmap;
+
+    if (pDraw->type == DRAWABLE_PIXMAP)
+	return TRUE;
+
+    pRoot = pScreen->root;
+    pRootPixmap = pScreen->GetWindowPixmap(pRoot);
+
+    pWin = (WindowPtr) pDraw;
+    pWinPixmap = pScreen->GetWindowPixmap(pWin);
+    if (pRootPixmap != pWinPixmap)
+	return FALSE;
+    if (!RegionEqual(&pWin->clipList, &pRoot->winSize))
+	return FALSE;
+
+    /* Does the window match the pixmap exactly? */
+    if (pDraw->x != 0 ||
+	pDraw->y != 0 ||
+#ifdef COMPOSITE
+	pDraw->x != pWinPixmap->screen_x ||
+	pDraw->y != pWinPixmap->screen_y ||
+#endif
+	pDraw->width != pWinPixmap->drawable.width ||
+	pDraw->height != pWinPixmap->drawable.height)
+	return FALSE;
+
+    return TRUE;
+}
+
+/* Can we do a pixmap exchange instead of a blit? */
+Bool
+DRI2CanExchange(DrawablePtr pDraw)
+{
+    return FALSE;
+}
+
+void
+DRI2WaitMSCComplete(ClientPtr client, DrawablePtr pDraw, int frame,
+		    unsigned int tv_sec, unsigned int tv_usec)
+{
+    DRI2DrawablePtr pPriv;
+
+    pPriv = DRI2GetDrawable(pDraw);
+    if (pPriv == NULL)
+	return;
+
+    ProcDRI2WaitMSCReply(client, ((CARD64)tv_sec * 1000000) + tv_usec,
+			 frame, pPriv->swap_count);
+
+    if (pPriv->blockedClient)
+	AttendClient(pPriv->blockedClient);
+
+    pPriv->blockedClient = NULL;
+    pPriv->blockedOnMsc = FALSE;
+}
+
+static void
+DRI2WakeClient(ClientPtr client, DrawablePtr pDraw, int frame,
+	       unsigned int tv_sec, unsigned int tv_usec)
+{
+    ScreenPtr	    pScreen = pDraw->pScreen;
+    DRI2DrawablePtr pPriv;
+
+    pPriv = DRI2GetDrawable(pDraw);
+    if (pPriv == NULL) {
+        xf86DrvMsg(pScreen->myNum, X_ERROR,
+		   "[DRI2] %s: bad drawable\n", __func__);
+	return;
+    }
+
+    /*
+     * Swap completed.
+     * Wake the client iff:
+     *   - it was waiting on SBC
+     *   - was blocked due to GLX make current
+     *   - was blocked due to swap throttling
+     *   - is not blocked due to an MSC wait
+     */
+    if (pPriv->target_sbc != -1 &&
+	pPriv->target_sbc <= pPriv->swap_count) {
+	ProcDRI2WaitMSCReply(client, ((CARD64)tv_sec * 1000000) + tv_usec,
+			     frame, pPriv->swap_count);
+	pPriv->target_sbc = -1;
+
+	AttendClient(pPriv->blockedClient);
+	pPriv->blockedClient = NULL;
+    } else if (pPriv->target_sbc == -1 && !pPriv->blockedOnMsc) {
+	if (pPriv->blockedClient) {
+	    AttendClient(pPriv->blockedClient);
+	    pPriv->blockedClient = NULL;
+	}
+    }
+}
+
+void
+DRI2SwapComplete(ClientPtr client, DrawablePtr pDraw, int frame,
+		   unsigned int tv_sec, unsigned int tv_usec, int type,
+		   DRI2SwapEventPtr swap_complete, void *swap_data)
+{
+    ScreenPtr	    pScreen = pDraw->pScreen;
+    DRI2DrawablePtr pPriv;
+    CARD64          ust = 0;
+    BoxRec          box;
+    RegionRec       region;
+
+    pPriv = DRI2GetDrawable(pDraw);
+    if (pPriv == NULL) {
+        xf86DrvMsg(pScreen->myNum, X_ERROR,
+		   "[DRI2] %s: bad drawable\n", __func__);
+	return;
+    }
+
+    pPriv->swapsPending--;
+    pPriv->swap_count++;
+
+    box.x1 = 0;
+    box.y1 = 0;
+    box.x2 = pDraw->width;
+    box.y2 = pDraw->height;
+    RegionInit(&region, &box, 0);
+    DRI2CopyRegion(pDraw, &region, DRI2BufferFakeFrontLeft,
+		   DRI2BufferFrontLeft);
+
+    ust = ((CARD64)tv_sec * 1000000) + tv_usec;
+    if (swap_complete)
+	swap_complete(client, swap_data, type, ust, frame, pPriv->swap_count);
+
+    pPriv->last_swap_msc = frame;
+    pPriv->last_swap_ust = ust;
+
+    DRI2WakeClient(client, pDraw, frame, tv_sec, tv_usec);
+}
+
+Bool
+DRI2WaitSwap(ClientPtr client, DrawablePtr pDrawable)
+{
+    DRI2DrawablePtr pPriv = DRI2GetDrawable(pDrawable);
+
+    /* If we're currently waiting for a swap on this drawable, reset
+     * the request and suspend the client.  We only support one
+     * blocked client per drawable. */
+    if ((pPriv->swapsPending) &&
+	pPriv->blockedClient == NULL) {
+	ResetCurrentRequest(client);
+	client->sequence--;
+	__DRI2BlockClient(client, pPriv);
+	return TRUE;
+    }
+
+    return FALSE;
+}
+
+int
+DRI2SwapBuffers(ClientPtr client, DrawablePtr pDraw, CARD64 target_msc,
+		CARD64 divisor, CARD64 remainder, CARD64 *swap_target,
+		DRI2SwapEventPtr func, void *data)
+{
+    ScreenPtr       pScreen = pDraw->pScreen;
+    DRI2ScreenPtr   ds = DRI2GetScreen(pDraw->pScreen);
+    DRI2DrawablePtr pPriv;
+    DRI2BufferPtr   pDestBuffer = NULL, pSrcBuffer = NULL;
+    int             ret, i;
+    CARD64          ust, current_msc;
+
+    pPriv = DRI2GetDrawable(pDraw);
+    if (pPriv == NULL) {
+        xf86DrvMsg(pScreen->myNum, X_ERROR,
+		   "[DRI2] %s: bad drawable\n", __func__);
+	return BadDrawable;
+    }
+
+    for (i = 0; i < pPriv->bufferCount; i++) {
+	if (pPriv->buffers[i]->attachment == DRI2BufferFrontLeft)
+	    pDestBuffer = (DRI2BufferPtr) pPriv->buffers[i];
+	if (pPriv->buffers[i]->attachment == DRI2BufferBackLeft)
+	    pSrcBuffer = (DRI2BufferPtr) pPriv->buffers[i];
+    }
+    if (pSrcBuffer == NULL || pDestBuffer == NULL) {
+        xf86DrvMsg(pScreen->myNum, X_ERROR,
+		   "[DRI2] %s: drawable has no back or front?\n", __func__);
+	return BadDrawable;
+    }
+
+    /* Old DDX or no swap interval, just blit */
+    if (!ds->ScheduleSwap || !pPriv->swap_interval) {
+	BoxRec box;
+	RegionRec region;
+
+	box.x1 = 0;
+	box.y1 = 0;
+	box.x2 = pDraw->width;
+	box.y2 = pDraw->height;
+	RegionInit(&region, &box, 0);
+
+	pPriv->swapsPending++;
+
+	(*ds->CopyRegion)(pDraw, &region, pDestBuffer, pSrcBuffer);
+	DRI2SwapComplete(client, pDraw, target_msc, 0, 0, DRI2_BLIT_COMPLETE,
+			 func, data);
+	return Success;
+    }
+
+    /*
+     * In the simple glXSwapBuffers case, all params will be 0, and we just
+     * need to schedule a swap for the last swap target + the swap interval.
+     */
+    if (target_msc == 0 && divisor == 0 && remainder == 0) {
+	/* If the current vblank count of the drawable's crtc is lower
+	 * than the count stored in last_swap_target from a previous swap
+	 * then reinitialize last_swap_target to the current crtc's msc,
+	 * otherwise the swap will hang. This will happen if the drawable
+	 * is moved to a crtc with a lower refresh rate, or a crtc that just
+	 * got enabled.
+	 */
+	if (ds->GetMSC) {
+	    if (!(*ds->GetMSC)(pDraw, &ust, &current_msc))
+		pPriv->last_swap_target = 0;
+
+	    if (current_msc < pPriv->last_swap_target)
+		pPriv->last_swap_target = current_msc;
+
+	}
+
+	/*
+	 * Swap target for this swap is last swap target + swap interval since
+	 * we have to account for the current swap count, interval, and the
+	 * number of pending swaps.
+	 */
+	*swap_target = pPriv->last_swap_target + pPriv->swap_interval;
+
+    } else {
+	/* glXSwapBuffersMscOML could have a 0 target_msc, honor it */
+	*swap_target = target_msc;
+    }
+
+    pPriv->swapsPending++;
+    ret = (*ds->ScheduleSwap)(client, pDraw, pDestBuffer, pSrcBuffer,
+			      swap_target, divisor, remainder, func, data);
+    if (!ret) {
+	pPriv->swapsPending--; /* didn't schedule */
+        xf86DrvMsg(pScreen->myNum, X_ERROR,
+		   "[DRI2] %s: driver failed to schedule swap\n", __func__);
+	return BadDrawable;
+    }
+
+    pPriv->last_swap_target = *swap_target;
+
+    /* According to spec, return expected swapbuffers count SBC after this swap
+     * will complete.
+     */
+    *swap_target = pPriv->swap_count + pPriv->swapsPending;
+
+    DRI2InvalidateDrawable(pDraw);
+
+    return Success;
+}
+
+void
+DRI2SwapInterval(DrawablePtr pDrawable, int interval)
+{
+    ScreenPtr       pScreen = pDrawable->pScreen;
+    DRI2DrawablePtr pPriv = DRI2GetDrawable(pDrawable);
+
+    if (pPriv == NULL) {
+        xf86DrvMsg(pScreen->myNum, X_ERROR,
+		   "[DRI2] %s: bad drawable\n", __func__);
+	return;
+    }
+
+    /* fixme: check against arbitrary max? */
+    pPriv->swap_interval = interval;
+}
+
+int
+DRI2GetMSC(DrawablePtr pDraw, CARD64 *ust, CARD64 *msc, CARD64 *sbc)
+{
+    ScreenPtr pScreen = pDraw->pScreen;
+    DRI2ScreenPtr ds = DRI2GetScreen(pDraw->pScreen);
+    DRI2DrawablePtr pPriv;
+    Bool ret;
+
+    pPriv = DRI2GetDrawable(pDraw);
+    if (pPriv == NULL) {
+        xf86DrvMsg(pScreen->myNum, X_ERROR,
+		   "[DRI2] %s: bad drawable\n", __func__);
+	return BadDrawable;
+    }
+
+    if (!ds->GetMSC) {
+	*ust = 0;
+	*msc = 0;
+	*sbc = pPriv->swap_count;
+	return Success;
+    }
+
+    /*
+     * Spec needs to be updated to include unmapped or redirected
+     * drawables
+     */
+
+    ret = (*ds->GetMSC)(pDraw, ust, msc);
+    if (!ret)
+	return BadDrawable;
+
+    *sbc = pPriv->swap_count;
+
+    return Success;
+}
+
+int
+DRI2WaitMSC(ClientPtr client, DrawablePtr pDraw, CARD64 target_msc,
+	    CARD64 divisor, CARD64 remainder)
+{
+    DRI2ScreenPtr ds = DRI2GetScreen(pDraw->pScreen);
+    DRI2DrawablePtr pPriv;
+    Bool ret;
+
+    pPriv = DRI2GetDrawable(pDraw);
+    if (pPriv == NULL)
+	return BadDrawable;
+
+    /* Old DDX just completes immediately */
+    if (!ds->ScheduleWaitMSC) {
+	DRI2WaitMSCComplete(client, pDraw, target_msc, 0, 0);
+
+	return Success;
+    }
+
+    ret = (*ds->ScheduleWaitMSC)(client, pDraw, target_msc, divisor, remainder);
+    if (!ret)
+	return BadDrawable;
+
+    return Success;
+}
+
+int
+DRI2WaitSBC(ClientPtr client, DrawablePtr pDraw, CARD64 target_sbc)
+{
+    DRI2DrawablePtr pPriv;
+
+    pPriv = DRI2GetDrawable(pDraw);
+    if (pPriv == NULL)
+	return BadDrawable;
+
+    /* target_sbc == 0 means to block until all pending swaps are
+     * finished. Recalculate target_sbc to get that behaviour.
+     */
+    if (target_sbc == 0)
+        target_sbc = pPriv->swap_count + pPriv->swapsPending;
+
+    /* If current swap count already >= target_sbc, reply and
+     * return immediately with (ust, msc, sbc) triplet of
+     * most recent completed swap.
+     */
+    if (pPriv->swap_count >= target_sbc) {
+        ProcDRI2WaitMSCReply(client, pPriv->last_swap_ust,
+                             pPriv->last_swap_msc, pPriv->swap_count);
+        return Success;
+    }
+
+    pPriv->target_sbc = target_sbc;
+    __DRI2BlockClient(client, pPriv);
+
+    return Success;
+}
+
+Bool
+DRI2HasSwapControl(ScreenPtr pScreen)
+{
+    DRI2ScreenPtr ds = DRI2GetScreen(pScreen);
+
+    return ds->ScheduleSwap && ds->GetMSC;
+}
+
+Bool
+DRI2Connect(ScreenPtr pScreen, unsigned int driverType, int *fd,
+	    const char **driverName, const char **deviceName)
+{
+    DRI2ScreenPtr ds;
+
+    if (!dixPrivateKeyRegistered(dri2ScreenPrivateKey))
+	return FALSE;
+
+    ds = DRI2GetScreen(pScreen);
+    if (ds == NULL || driverType >= ds->numDrivers ||
+	    !ds->driverNames[driverType])
+	return FALSE;
+
+    *fd = ds->fd;
+    *driverName = ds->driverNames[driverType];
+    *deviceName = ds->deviceName;
+
+    return TRUE;
+}
+
+Bool
+DRI2Authenticate(ScreenPtr pScreen, uint32_t magic)
+{
+    DRI2ScreenPtr ds = DRI2GetScreen(pScreen);
+
+    if (ds == NULL || (*ds->AuthMagic)(ds->fd, magic))
+        return FALSE;
+
+    return TRUE;
+}
+
+static int
+DRI2ConfigNotify(WindowPtr pWin, int x, int y, int w, int h, int bw,
+		 WindowPtr pSib)
+{
+    DrawablePtr pDraw = (DrawablePtr)pWin;
+    ScreenPtr pScreen = pDraw->pScreen;
+    DRI2ScreenPtr ds = DRI2GetScreen(pScreen);
+    DRI2DrawablePtr dd = DRI2GetDrawable(pDraw);
+    int ret;
+
+    if (ds->ConfigNotify) {
+	pScreen->ConfigNotify = ds->ConfigNotify;
+
+	ret = (*pScreen->ConfigNotify)(pWin, x, y, w, h, bw, pSib);
+
+	ds->ConfigNotify = pScreen->ConfigNotify;
+	pScreen->ConfigNotify = DRI2ConfigNotify;
+	if (ret)
+	    return ret;
+    }
+
+    if (!dd || (dd->width == w && dd->height == h))
+	return Success;
+
+    DRI2InvalidateDrawable(pDraw);
+    return Success;
+}
+
+Bool
+DRI2ScreenInit(ScreenPtr pScreen, DRI2InfoPtr info)
+{
+    DRI2ScreenPtr ds;
+    const char* driverTypeNames[] = {
+	"DRI", /* DRI2DriverDRI */
+	"VDPAU", /* DRI2DriverVDPAU */
+    };
+    unsigned int i;
+    CARD8 cur_minor;
+
+    if (info->version < 3)
+	return FALSE;
+
+    if (!xf86VGAarbiterAllowDRI(pScreen)) {
+        xf86DrvMsg(pScreen->myNum, X_WARNING,
+                  "[DRI2] Direct rendering is not supported when VGA arb is necessary for the device\n");
+        return FALSE;
+    }
+
+    if (!dixRegisterPrivateKey(&dri2ScreenPrivateKeyRec, PRIVATE_SCREEN, 0))
+	return FALSE;
+
+    if (!dixRegisterPrivateKey(&dri2WindowPrivateKeyRec, PRIVATE_WINDOW, 0))
+	return FALSE;
+
+    if (!dixRegisterPrivateKey(&dri2PixmapPrivateKeyRec, PRIVATE_PIXMAP, 0))
+	return FALSE;
+
+    ds = calloc(1, sizeof *ds);
+    if (!ds)
+	return FALSE;
+
+    ds->screen         = pScreen;
+    ds->fd	       = info->fd;
+    ds->deviceName     = info->deviceName;
+    dri2_major         = 1;
+
+    ds->CreateBuffer   = info->CreateBuffer;
+    ds->DestroyBuffer  = info->DestroyBuffer;
+    ds->CopyRegion     = info->CopyRegion;
+
+    if (info->version >= 4) {
+	ds->ScheduleSwap = info->ScheduleSwap;
+	ds->ScheduleWaitMSC = info->ScheduleWaitMSC;
+	ds->GetMSC = info->GetMSC;
+	cur_minor = 3;
+    } else {
+	cur_minor = 1;
+    }
+
+    if (info->version >= 5) {
+        ds->AuthMagic = info->AuthMagic;
+    }
+
+    /*
+     * if the driver doesn't provide an AuthMagic function or the info struct
+     * version is too low, it relies on the old method (using libdrm) or fail
+     */
+    if (!ds->AuthMagic)
+#ifdef WITH_LIBDRM
+        ds->AuthMagic = drmAuthMagic;
+#else
+        goto err_out;
+#endif
+
+    /* Initialize minor if needed and set to minimum provied by DDX */
+    if (!dri2_minor || dri2_minor > cur_minor)
+	dri2_minor = cur_minor;
+
+    if (info->version == 3 || info->numDrivers == 0) {
+	/* Driver too old: use the old-style driverName field */
+	ds->numDrivers = 1;
+	ds->driverNames = malloc(sizeof(*ds->driverNames));
+	if (!ds->driverNames)
+	    goto err_out;
+	ds->driverNames[0] = info->driverName;
+    } else {
+	ds->numDrivers = info->numDrivers;
+	ds->driverNames = malloc(info->numDrivers * sizeof(*ds->driverNames));
+	if (!ds->driverNames)
+		goto err_out;
+	memcpy(ds->driverNames, info->driverNames,
+	       info->numDrivers * sizeof(*ds->driverNames));
+    }
+
+    dixSetPrivate(&pScreen->devPrivates, dri2ScreenPrivateKey, ds);
+
+    ds->ConfigNotify = pScreen->ConfigNotify;
+    pScreen->ConfigNotify = DRI2ConfigNotify;
+
+    xf86DrvMsg(pScreen->myNum, X_INFO, "[DRI2] Setup complete\n");
+    for (i = 0; i < sizeof(driverTypeNames) / sizeof(driverTypeNames[0]); i++) {
+	if (i < ds->numDrivers && ds->driverNames[i]) {
+	    xf86DrvMsg(pScreen->myNum, X_INFO, "[DRI2]   %s driver: %s\n",
+		       driverTypeNames[i], ds->driverNames[i]);
+	}
+    }
+
+    return TRUE;
+
+err_out:
+    xf86DrvMsg(pScreen->myNum, X_WARNING,
+            "[DRI2] Initialization failed for info version %d.\n", info->version);
+    free(ds);
+    return FALSE;
+}
+
+void
+DRI2CloseScreen(ScreenPtr pScreen)
+{
+    DRI2ScreenPtr ds = DRI2GetScreen(pScreen);
+
+    free(ds->driverNames);
+    free(ds);
+    dixSetPrivate(&pScreen->devPrivates, dri2ScreenPrivateKey, NULL);
+}
+
+extern ExtensionModule dri2ExtensionModule;
+
+static pointer
+DRI2Setup(pointer module, pointer opts, int *errmaj, int *errmin)
+{
+    static Bool setupDone = FALSE;
+
+    dri2DrawableRes = CreateNewResourceType(DRI2DrawableGone, "DRI2Drawable");
+
+    if (!setupDone)
+    {
+	setupDone = TRUE;
+	LoadExtension(&dri2ExtensionModule, FALSE);
+    }
+    else
+    {
+	if (errmaj)
+	    *errmaj = LDR_ONCEONLY;
+    }
+
+    return (pointer) 1;
+}
+
+static XF86ModuleVersionInfo DRI2VersRec =
+{
+    "dri2",
+    MODULEVENDORSTRING,
+    MODINFOSTRING1,
+    MODINFOSTRING2,
+    XORG_VERSION_CURRENT,
+    1, 2, 0,
+    ABI_CLASS_EXTENSION,
+    ABI_EXTENSION_VERSION,
+    MOD_CLASS_NONE,
+    { 0, 0, 0, 0 }
+};
+
+_X_EXPORT XF86ModuleData dri2ModuleData = { &DRI2VersRec, DRI2Setup, NULL };
+
+void
+DRI2Version(int *major, int *minor)
+{
+    if (major != NULL)
+	*major = DRI2VersRec.majorversion;
+
+    if (minor != NULL)
+	*minor = DRI2VersRec.minorversion;
+}
diff --git a/xorg-server/hw/xfree86/loader/loadmod.c b/xorg-server/hw/xfree86/loader/loadmod.c
index 271cb5b79..46ce68b86 100644
--- a/xorg-server/hw/xfree86/loader/loadmod.c
+++ b/xorg-server/hw/xfree86/loader/loadmod.c
@@ -1,1255 +1,1261 @@
-/*

- * Copyright 1995-1998 by Metro Link, Inc.

- *

- * Permission to use, copy, modify, distribute, and sell this software and its

- * documentation for any purpose is hereby granted without fee, provided that

- * the above copyright notice appear in all copies and that both that

- * copyright notice and this permission notice appear in supporting

- * documentation, and that the name of Metro Link, Inc. not be used in

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

- * specific, written prior permission.  Metro Link, Inc. makes no

- * representations about the suitability of this software for any purpose.

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

- *

- * METRO LINK, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

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

- * EVENT SHALL METRO LINK, INC. 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.

- */

-/*

- * Copyright (c) 1997-2002 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 "os.h"

-/* For stat() and related stuff */

-#define NO_OSLIB_PROTOTYPES

-#include "xf86_OSlib.h"

-#define LOADERDECLARATIONS

-#include "loaderProcs.h"

-#include "misc.h"

-#include "xf86.h"

-#include "xf86Priv.h"

-#include "xf86Xinput.h"

-#include "loader.h"

-#include "xf86Optrec.h"

-

-#include <sys/types.h>

-#include <regex.h>

-#include <dirent.h>

-#include <limits.h>

-

-typedef struct _pattern {

-    const char *pattern;

-    regex_t rex;

-} PatternRec, *PatternPtr;

-

-/* Prototypes for static functions */

-static char *FindModule(const char *, const char *, const char **,

-			PatternPtr);

-static Bool CheckVersion(const char *, XF86ModuleVersionInfo *,

-			 const XF86ModReqInfo *);

-static void UnloadModuleOrDriver(ModuleDescPtr mod);

-static char *LoaderGetCanonicalName(const char *, PatternPtr);

-static void RemoveChild(ModuleDescPtr);

-static ModuleDescPtr doLoadModule(const char *, const char *, const char **,

-				  const char **, pointer,

-				  const XF86ModReqInfo *, int *, int *);

-

-const ModuleVersions LoaderVersionInfo = {

-    XORG_VERSION_CURRENT,

-    ABI_ANSIC_VERSION,

-    ABI_VIDEODRV_VERSION,

-    ABI_XINPUT_VERSION,

-    ABI_EXTENSION_VERSION,

-    ABI_FONT_VERSION

-};

-

-static void

-FreeStringList(char **paths)

-{

-    char **p;

-

-    if (!paths)

-	return;

-

-    for (p = paths; *p; p++)

-	free(*p);

-

-    free(paths);

-}

-

-static char **defaultPathList = NULL;

-

-static Bool

-PathIsAbsolute(const char *path)

-{

-    return *path == '/';

-}	

-

-/*

- * Convert a comma-separated path into a NULL-terminated array of path

- * elements, rejecting any that are not full absolute paths, and appending

- * a '/' when it isn't already present.

- */

-static char **

-InitPathList(const char *path)

-{

-    char *fullpath = NULL;

-    char *elem = NULL;

-    char **list = NULL, **save = NULL;

-    int len;

-    int addslash;

-    int n = 0;

-

-    if (!path)

-	return defaultPathList;

-

-    fullpath = strdup(path);

-    if (!fullpath)

-	return NULL;

-    elem = strtok(fullpath, ",");

-    while (elem) {

-	if (PathIsAbsolute(elem))

-	{

-	    len = strlen(elem);

-	    addslash = (elem[len - 1] != '/');

-	    if (addslash)

-		len++;

-	    save = list;

-	    list = realloc(list, (n + 2) * sizeof(char *));

-	    if (!list) {

-		if (save) {

-		    save[n] = NULL;

-		    FreeStringList(save);

-		}

-		free(fullpath);

-		return NULL;

-	    }

-	    list[n] = malloc(len + 1);

-	    if (!list[n]) {

-		FreeStringList(list);

-		free(fullpath);

-		return NULL;

-	    }

-	    strcpy(list[n], elem);

-	    if (addslash) {

-		list[n][len - 1] = '/';

-		list[n][len] = '\0';

-	    }

-	    n++;

-	}

-	elem = strtok(NULL, ",");

-    }

-    if (list)

-	list[n] = NULL;

-    free(fullpath);

-    return list;

-}

-

-static void

-FreePathList(char **pathlist)

-{

-    if (pathlist && pathlist != defaultPathList)

-	FreeStringList(pathlist);

-}

-

-void

-LoaderSetPath(const char *path)

-{

-    if (!path)

-	return;

-

-    defaultPathList = InitPathList(path);

-}

-

-/* Standard set of module subdirectories to search, in order of preference */

-static const char *stdSubdirs[] = {

-    "",

-    "input/",

-    "drivers/",

-    "multimedia/",

-    "extensions/",

-    "internal/",

-    NULL

-};

-

-/*

- * Standard set of module name patterns to check, in order of preference

- * These are regular expressions (suitable for use with POSIX regex(3)).

- *

- * This list assumes that you're an ELFish platform and therefore your

- * shared libraries are named something.so.  If we're ever nuts enough

- * to port this DDX to, say, Darwin, we'll need to fix this.

- */

-static PatternRec stdPatterns[] = {

-    {"^lib(.*)\\.so$",},

-    {"(.*)_drv\\.so$",},

-    {"(.*)\\.so$",},

-    {NULL,}

-};

-

-static PatternPtr

-InitPatterns(const char **patternlist)

-{

-    char errmsg[80];

-    int i, e;

-    PatternPtr patterns = NULL;

-    PatternPtr p = NULL;

-    static int firstTime = 1;

-    const char **s;

-

-    if (firstTime) {

-	/* precompile stdPatterns */

-	firstTime = 0;

-	for (p = stdPatterns; p->pattern; p++)

-	    if ((e = regcomp(&p->rex, p->pattern, REG_EXTENDED)) != 0) {

-		regerror(e, &p->rex, errmsg, sizeof(errmsg));

-		FatalError("InitPatterns: regcomp error for `%s': %s\n",

-			   p->pattern, errmsg);

-	    }

-    }

-

-    if (patternlist) {

-	for (i = 0, s = patternlist; *s; i++, s++)

-	    if (*s == DEFAULT_LIST)

-		i += sizeof(stdPatterns) / sizeof(stdPatterns[0]) - 1 - 1;

-	patterns = malloc((i + 1) * sizeof(PatternRec));

-	if (!patterns) {

-	    return NULL;

-	}

-	for (i = 0, s = patternlist; *s; i++, s++)

-	    if (*s != DEFAULT_LIST) {

-		p = patterns + i;

-		p->pattern = *s;

-		if ((e = regcomp(&p->rex, p->pattern, REG_EXTENDED)) != 0) {

-		    regerror(e, &p->rex, errmsg, sizeof(errmsg));

-		    ErrorF("InitPatterns: regcomp error for `%s': %s\n",

-			   p->pattern, errmsg);

-		    i--;

-		}

-	    } else {

-		for (p = stdPatterns; p->pattern; p++, i++)

-		    patterns[i] = *p;

-		if (p != stdPatterns)

-		    i--;

-	    }

-	patterns[i].pattern = NULL;

-    } else

-	patterns = stdPatterns;

-    return patterns;

-}

-

-static void

-FreePatterns(PatternPtr patterns)

-{

-    if (patterns && patterns != stdPatterns)

-	free(patterns);

-}

-

-static const char **

-InitSubdirs(const char **subdirlist)

-{

-    int i;

-    const char **tmp_subdirlist = NULL;

-    char **subdirs = NULL;

-    const char **s, **stmp = NULL;

-    const char *osname;

-    const char *slash;

-    int oslen = 0, len;

-    Bool indefault;

-

-    if (subdirlist == NULL) {

-	subdirlist = tmp_subdirlist = malloc(2 * sizeof(char *));

-	if (subdirlist == NULL)

-	    return NULL;

-	subdirlist[0] = DEFAULT_LIST;

-	subdirlist[1] = NULL;

-    }

-

-    LoaderGetOS(&osname, NULL, NULL, NULL);

-    oslen = strlen(osname);

-

-    {

-	/* Count number of entries and check for invalid paths */

-	for (i = 0, s = subdirlist; *s; i++, s++) {

-	    if (*s == DEFAULT_LIST) {

-		i += sizeof(stdSubdirs) / sizeof(stdSubdirs[0]) - 1 - 1;

-	    } else {

-		/*

-		 * Path validity check.  Don't allow absolute paths, or

-		 * paths containing "..".  To catch absolute paths on

-		 * platforms that use driver letters, don't allow the ':'

-		 * character to appear at all.

-		 */

-		if (**s == '/' || **s == '\\' || strchr(*s, ':') ||

-		    strstr(*s, "..")) {

-		    xf86Msg(X_ERROR, "InitSubdirs: Bad subdir: \"%s\"\n", *s);

-		    free(tmp_subdirlist);

-		    return NULL;

-		}

-	    }

-	}

-	subdirs = malloc((i * 2 + 1) * sizeof(char *));

-	if (!subdirs) {

-	    free(tmp_subdirlist);

-	    return NULL;

-	}

-	i = 0;

-	s = subdirlist;

-	indefault = FALSE;

-	while (*s) {

-	    if (*s == DEFAULT_LIST) {

-		/* Divert to the default list */

-		indefault = TRUE;

-		stmp = ++s;

-		s = stdSubdirs;

-	    }

-	    len = strlen(*s);

-	    if (**s && (*s)[len - 1] != '/') {

-		slash = "/";

-		len++;

-	    } else

-		slash = "";

-	    len += oslen + 2;

-	    if (!(subdirs[i] = malloc(len))) {

-		while (--i >= 0)

-		    free(subdirs[i]);

-		free(subdirs);

-		free(tmp_subdirlist);

-		return NULL;

-	    }

-	    /* tack on the OS name */

-	    sprintf(subdirs[i], "%s%s%s/", *s, slash, osname);

-	    i++;

-	    /* path as given */

-	    subdirs[i] = strdup(*s);

-	    i++;

-	    s++;

-	    if (indefault && !s) {

-		/* revert back to the main list */

-		indefault = FALSE;

-		s = stmp;

-	    }

-	}

-	subdirs[i] = NULL;

-    }

-    free(tmp_subdirlist);

-    return (const char **)subdirs;

-}

-

-static void

-FreeSubdirs(const char **subdirs)

-{

-    const char **s;

-

-    if (subdirs) {

-	for (s = subdirs; *s; s++)

-	    free((char *)*s);

-	free(subdirs);

-    }

-}

-

-static char *

-FindModuleInSubdir(const char *dirpath, const char *module)

-{

-    struct dirent *direntry = NULL;

-    DIR *dir = NULL;

-    char *ret = NULL, tmpBuf[PATH_MAX];

-    struct stat stat_buf;

-

-    dir = opendir(dirpath);

-    if (!dir)

-        return NULL;

-

-    while ((direntry = readdir(dir))) {

-        if (direntry->d_name[0] == '.')

-            continue;

-        snprintf(tmpBuf, PATH_MAX, "%s%s/", dirpath, direntry->d_name);

-	/* the stat with the appended / fails for normal files,

-	   and works for sub dirs fine, looks a bit strange in strace

-	   but does seem to work */

-        if ((stat(tmpBuf, &stat_buf) == 0) && S_ISDIR(stat_buf.st_mode)) {

-            if ((ret = FindModuleInSubdir(tmpBuf, module)))

-                break;

-            continue;

-        }

- 

-        snprintf(tmpBuf, PATH_MAX, "lib%s.so", module);

-        if (strcmp(direntry->d_name, tmpBuf) == 0) {

-            if (asprintf(&ret, "%s%s", dirpath, tmpBuf) == -1)

-		ret = NULL;

-            break;

-        }

-

-        snprintf(tmpBuf, PATH_MAX, "%s_drv.so", module);

-        if (strcmp(direntry->d_name, tmpBuf) == 0) {

-            if (asprintf(&ret, "%s%s", dirpath, tmpBuf) == -1)

-		ret = NULL;

-            break;

-        }

-

-        snprintf(tmpBuf, PATH_MAX, "%s.so", module);

-        if (strcmp(direntry->d_name, tmpBuf) == 0) {

-            if (asprintf(&ret, "%s%s", dirpath, tmpBuf) == -1)

-		ret = NULL;

-            break;

-        }

-    }

-    

-    closedir(dir);

-    return ret;

-}

-

-static char *

-FindModule(const char *module, const char *dirname, const char **subdirlist,

-	   PatternPtr patterns)

-{

-    char buf[PATH_MAX + 1];

-    char *dirpath = NULL;

-    char *name = NULL;

-    int dirlen;

-    const char **subdirs = NULL;

-    const char **s;

-

-    dirpath = (char *)dirname;

-    if (strlen(dirpath) > PATH_MAX)

-	return NULL;

-    

-    subdirs = InitSubdirs(subdirlist);

-    if (!subdirs)

-	return NULL;

-

-    for (s = subdirs; *s; s++) {

-	if ((dirlen = strlen(dirpath) + strlen(*s)) > PATH_MAX)

-	    continue;

-	strcpy(buf, dirpath);

-	strcat(buf, *s);

-        if ((name = FindModuleInSubdir(buf, module)))

-            break;

-    }

-

-    FreeSubdirs(subdirs);

-    if (dirpath != dirname)

-	free(dirpath);

-

-    return name;

-}

-

-char **

-LoaderListDirs(const char **subdirlist, const char **patternlist)

-{

-    char buf[PATH_MAX + 1];

-    char **pathlist;

-    char **elem;

-    const char **subdirs;

-    const char **s;

-    PatternPtr patterns;

-    PatternPtr p;

-    DIR *d;

-    struct dirent *dp;

-    regmatch_t match[2];

-    struct stat stat_buf;

-    int len, dirlen;

-    char *fp;

-    char **listing = NULL;

-    char **save;

-    int n = 0;

-

-    if (!(pathlist = InitPathList(NULL)))

-	return NULL;

-    if (!(subdirs = InitSubdirs(subdirlist))) {

-	FreePathList(pathlist);

-	return NULL;

-    }

-    if (!(patterns = InitPatterns(patternlist))) {

-	FreePathList(pathlist);

-	FreeSubdirs(subdirs);

-	return NULL;

-    }

-

-    for (elem = pathlist; *elem; elem++) {

-	for (s = subdirs; *s; s++) {

-	    if ((dirlen = strlen(*elem) + strlen(*s)) > PATH_MAX)

-		continue;

-	    strcpy(buf, *elem);

-	    strcat(buf, *s);

-	    fp = buf + dirlen;

-	    if (stat(buf, &stat_buf) == 0 && S_ISDIR(stat_buf.st_mode) &&

-		(d = opendir(buf))) {

-		if (buf[dirlen - 1] != '/') {

-		    buf[dirlen++] = '/';

-		    fp++;

-		}

-		while ((dp = readdir(d))) {

-		    if (dirlen + strlen(dp->d_name) > PATH_MAX)

-			continue;

-		    strcpy(fp, dp->d_name);

-		    if (!(stat(buf, &stat_buf) == 0 &&

-			  S_ISREG(stat_buf.st_mode)))

-			continue;

-		    for (p = patterns; p->pattern; p++) {

-			if (regexec(&p->rex, dp->d_name, 2, match, 0) == 0 &&

-			    match[1].rm_so != -1) {

-			    len = match[1].rm_eo - match[1].rm_so;

-			    save = listing;

-			    listing = realloc(listing,

-					       (n + 2) * sizeof(char *));

-			    if (!listing) {

-				if (save) {

-				    save[n] = NULL;

-				    FreeStringList(save);

-				}

-				FreePathList(pathlist);

-				FreeSubdirs(subdirs);

-				FreePatterns(patterns);

-				return NULL;

-			    }

-			    listing[n] = malloc(len + 1);

-			    if (!listing[n]) {

-				FreeStringList(listing);

-				FreePathList(pathlist);

-				FreeSubdirs(subdirs);

-				FreePatterns(patterns);

-				return NULL;

-			    }

-			    strncpy(listing[n], dp->d_name + match[1].rm_so,

-				    len);

-			    listing[n][len] = '\0';

-			    n++;

-			    break;

-			}

-		    }

-		}

-		closedir(d);

-	    }

-	}

-    }

-    if (listing)

-	listing[n] = NULL;

-    return listing;

-}

-

-void

-LoaderFreeDirList(char **list)

-{

-    FreeStringList(list);

-}

-

-static Bool

-CheckVersion(const char *module, XF86ModuleVersionInfo * data,

-	     const XF86ModReqInfo * req)

-{

-    int vercode[4];

-    char verstr[4];

-    long ver = data->xf86version;

-    MessageType errtype;

-

-    xf86Msg(X_INFO, "Module %s: vendor=\"%s\"\n",

-	    data->modname ? data->modname : "UNKNOWN!",

-	    data->vendor ? data->vendor : "UNKNOWN!");

-

-    /* Check for the different scheme used in XFree86 4.0.x releases:

-     * ((((((((major << 7) | minor) << 7) | subminor) << 5) | beta) << 5) | alpha)

-     * Since it wasn't used in 4.1.0 or later, limit to versions in the 4.0.x

-     * range, which limits the overlap with the new version scheme to conflicts

-     * with 6.71.8.764 through 6.72.39.934.

-     */

-    if ((ver > (4 << 24)) && (ver < ( (4 << 24) + (1 << 17)))) {

-	/* 4.0.x and earlier */

-	verstr[1] = verstr[3] = 0;

-	verstr[2] = (ver & 0x1f) ? (ver & 0x1f) + 'a' - 1 : 0;

-	ver >>= 5;

-	verstr[0] = (ver & 0x1f) ? (ver & 0x1f) + 'A' - 1 : 0;

-	ver >>= 5;

-	vercode[2] = ver & 0x7f;

-	ver >>= 7;

-	vercode[1] = ver & 0x7f;

-	ver >>= 7;

-	vercode[0] = ver;

-	xf86ErrorF("\tcompiled for %d.%d", vercode[0], vercode[1]);

-	if (vercode[2] != 0)

-	    xf86ErrorF(".%d", vercode[2]);

-	xf86ErrorF("%s%s, module version = %d.%d.%d\n", verstr, verstr + 2,

-		   data->majorversion, data->minorversion, data->patchlevel);

-    } else {

-	vercode[0] = ver / 10000000;

-	vercode[1] = (ver / 100000) % 100;

-	vercode[2] = (ver / 1000) % 100;

-	vercode[3] = ver % 1000;

-	xf86ErrorF("\tcompiled for %d.%d.%d", vercode[0], vercode[1],

-		   vercode[2]);

-	if (vercode[3] != 0)

-	    xf86ErrorF(".%d", vercode[3]);

-	xf86ErrorF(", module version = %d.%d.%d\n", data->majorversion,

-		   data->minorversion, data->patchlevel);

-    }

-

-    if (data->moduleclass)

-	xf86ErrorFVerb(2, "\tModule class: %s\n", data->moduleclass);

-

-    ver = -1;

-    if (data->abiclass) {

-	int abimaj, abimin;

-	int vermaj, vermin;

-

-	if (!strcmp(data->abiclass, ABI_CLASS_ANSIC))

-	    ver = LoaderVersionInfo.ansicVersion;

-	else if (!strcmp(data->abiclass, ABI_CLASS_VIDEODRV))

-	    ver = LoaderVersionInfo.videodrvVersion;

-	else if (!strcmp(data->abiclass, ABI_CLASS_XINPUT))

-	    ver = LoaderVersionInfo.xinputVersion;

-	else if (!strcmp(data->abiclass, ABI_CLASS_EXTENSION))

-	    ver = LoaderVersionInfo.extensionVersion;

-	else if (!strcmp(data->abiclass, ABI_CLASS_FONT))

-	    ver = LoaderVersionInfo.fontVersion;

-

-	abimaj = GET_ABI_MAJOR(data->abiversion);

-	abimin = GET_ABI_MINOR(data->abiversion);

-	xf86ErrorFVerb(2, "\tABI class: %s, version %d.%d\n",

-		       data->abiclass, abimaj, abimin);

-	if (ver != -1) {

-	    vermaj = GET_ABI_MAJOR(ver);

-	    vermin = GET_ABI_MINOR(ver);

-	    if (abimaj != vermaj) {

-		if (LoaderOptions & LDR_OPT_ABI_MISMATCH_NONFATAL)

-		    errtype = X_WARNING;

-		else

-		    errtype = X_ERROR;

-		xf86MsgVerb(errtype, 0,

-			    "module ABI major version (%d) doesn't"

-			    " match the server's version (%d)\n",

-			    abimaj, vermaj);

-		if (!(LoaderOptions & LDR_OPT_ABI_MISMATCH_NONFATAL))

-		    return FALSE;

-	    } else if (abimin > vermin) {

-		if (LoaderOptions & LDR_OPT_ABI_MISMATCH_NONFATAL)

-		    errtype = X_WARNING;

-		else

-		    errtype = X_ERROR;

-		xf86MsgVerb(errtype, 0,

-			    "module ABI minor version (%d) is "

-			    "newer than the server's version "

-			    "(%d)\n", abimin, vermin);

-		if (!(LoaderOptions & LDR_OPT_ABI_MISMATCH_NONFATAL))

-		    return FALSE;

-	    }

-	}

-    }

-

-    /* Check against requirements that the caller has specified */

-    if (req) {

-	if (req->majorversion != MAJOR_UNSPEC) {

-	    if (data->majorversion != req->majorversion) {

-		xf86MsgVerb(X_WARNING, 2, "module major version (%d) "

-			    "doesn't match required major version (%d)\n",

-			    data->majorversion, req->majorversion);

-		return FALSE;

-	    } else if (req->minorversion != MINOR_UNSPEC) {

-		if (data->minorversion < req->minorversion) {

-		    xf86MsgVerb(X_WARNING, 2, "module minor version (%d) "

-				"is less than the required minor version (%d)\n",

-				data->minorversion, req->minorversion);

-		    return FALSE;

-		} else if (data->minorversion == req->minorversion &&

-			   req->patchlevel != PATCH_UNSPEC) {

-		    if (data->patchlevel < req->patchlevel) {

-			xf86MsgVerb(X_WARNING, 2, "module patch level (%d) "

-				    "is less than the required patch level (%d)\n",

-				    data->patchlevel, req->patchlevel);

-			return FALSE;

-		    }

-		}

-	    }

-	}

-	if (req->moduleclass) {

-	    if (!data->moduleclass ||

-		strcmp(req->moduleclass, data->moduleclass)) {

-		xf86MsgVerb(X_WARNING, 2, "Module class (%s) doesn't match "

-			    "the required class (%s)\n",

-			    data->moduleclass ? data->moduleclass : "<NONE>",

-			    req->moduleclass);

-		return FALSE;

-	    }

-	} else if (req->abiclass != ABI_CLASS_NONE) {

-	    if (!data->abiclass || strcmp(req->abiclass, data->abiclass)) {

-		xf86MsgVerb(X_WARNING, 2, "ABI class (%s) doesn't match the "

-			    "required ABI class (%s)\n",

-			    data->abiclass ? data->abiclass : "<NONE>",

-			    req->abiclass);

-		return FALSE;

-	    }

-	}

-	if ((req->abiclass != ABI_CLASS_NONE) &&

-	    req->abiversion != ABI_VERS_UNSPEC) {

-	    int reqmaj, reqmin, maj, min;

-

-	    reqmaj = GET_ABI_MAJOR(req->abiversion);

-	    reqmin = GET_ABI_MINOR(req->abiversion);

-	    maj = GET_ABI_MAJOR(data->abiversion);

-	    min = GET_ABI_MINOR(data->abiversion);

-	    if (maj != reqmaj) {

-		xf86MsgVerb(X_WARNING, 2, "ABI major version (%d) doesn't "

-			    "match the required ABI major version (%d)\n",

-			    maj, reqmaj);

-		return FALSE;

-	    }

-	    /* XXX Maybe this should be the other way around? */

-	    if (min > reqmin) {

-		xf86MsgVerb(X_WARNING, 2, "module ABI minor version (%d) "

-			    "is newer than that available (%d)\n", min, reqmin);

-		return FALSE;

-	    }

-	}

-    }

-    return TRUE;

-}

-

-static ModuleDescPtr

-AddSibling(ModuleDescPtr head, ModuleDescPtr new)

-{

-    new->sib = head;

-    return new;

-}

-

-pointer

-LoadSubModule(pointer _parent, const char *module,

-	      const char **subdirlist, const char **patternlist,

-	      pointer options, const XF86ModReqInfo * modreq,

-	      int *errmaj, int *errmin)

-{

-    ModuleDescPtr submod;

-    ModuleDescPtr parent = (ModuleDescPtr)_parent;

-

-    xf86MsgVerb(X_INFO, 3, "Loading sub module \"%s\"\n", module);

-

-    if (PathIsAbsolute(module)) {

-	xf86Msg(X_ERROR,

-		"LoadSubModule: Absolute module path not permitted: \"%s\"\n",

-		module);

-	if (errmaj)

-	    *errmaj = LDR_BADUSAGE;

-	if (errmin)

-	    *errmin = 0;

-	return NULL;

-    }

-

-    submod = doLoadModule(module, NULL, subdirlist, patternlist, options,

-			  modreq, errmaj, errmin);

-    if (submod && submod != (ModuleDescPtr) 1) {

-	parent->child = AddSibling(parent->child, submod);

-	submod->parent = parent;

-    }

-    return submod;

-}

-

-static ModuleDescPtr

-NewModuleDesc(const char *name)

-{

-    ModuleDescPtr mdp = calloc(1, sizeof(ModuleDesc));

-

-    if (mdp)

-	mdp->name = xstrdup(name);

-

-    return mdp;

-}

-

-ModuleDescPtr

-DuplicateModule(ModuleDescPtr mod, ModuleDescPtr parent)

-{

-    ModuleDescPtr ret;

-    int errmaj, errmin;

-

-    if (!mod)

-	return NULL;

-

-    ret = NewModuleDesc(mod->name);

-    if (ret == NULL)

-	return NULL;

-

-    if (!(ret->handle = LoaderOpen(mod->path, &errmaj, &errmin))) {

-        free(ret);

-        return NULL;

-    }

-

-    ret->SetupProc = mod->SetupProc;

-    ret->TearDownProc = mod->TearDownProc;

-    ret->TearDownData = NULL;

-    ret->child = DuplicateModule(mod->child, ret);

-    ret->sib = DuplicateModule(mod->sib, parent);

-    ret->parent = parent;

-    ret->VersionInfo = mod->VersionInfo;

-    ret->path = strdup(mod->path);

-

-    return ret;

-}

-

-static const char *compiled_in_modules[] = {

-    "ddc",

-    "i2c",

-    "ramdac",

-    NULL

-};

-

-static ModuleDescPtr

-doLoadModule(const char *module, const char *path, const char **subdirlist,

-	     const char **patternlist, pointer options,

-	     const XF86ModReqInfo * modreq,

-	     int *errmaj, int *errmin)

-{

-    XF86ModuleData *initdata = NULL;

-    char **pathlist = NULL;

-    char *found = NULL;

-    char *name = NULL;

-    char **path_elem = NULL;

-    char *p = NULL;

-    ModuleDescPtr ret = NULL;

-    PatternPtr patterns = NULL;

-    int noncanonical = 0;

-    char *m = NULL;

-    const char **cim;

-

-    xf86MsgVerb(X_INFO, 3, "LoadModule: \"%s\"", module);

-

-    patterns = InitPatterns(patternlist);

-    name = LoaderGetCanonicalName(module, patterns);

-    noncanonical = (name && strcmp(module, name) != 0);

-    if (noncanonical) {

-	xf86ErrorFVerb(3, " (%s)\n", name);

-	xf86MsgVerb(X_WARNING, 1,

-		    "LoadModule: given non-canonical module name \"%s\"\n",

-		    module);

-	m = name;

-    } else {

-	xf86ErrorFVerb(3, "\n");

-	m = (char *)module;

-    }

-

-    for (cim = compiled_in_modules; *cim; cim++)

-	if (!strcmp (m, *cim))

-	{

-	    xf86MsgVerb(X_INFO, 3, "Module \"%s\" already built-in\n", m);

-	    ret = (ModuleDescPtr) 1;

-	    goto LoadModule_exit;

-	}

-

-    if (!name) {

-	if (errmaj)

-	    *errmaj = LDR_BADUSAGE;

-	if (errmin)

-	    *errmin = 0;

-	goto LoadModule_fail;

-    }

-    ret = NewModuleDesc(name);

-    if (!ret) {

-	if (errmaj)

-	    *errmaj = LDR_NOMEM;

-	if (errmin)

-	    *errmin = 0;

-	goto LoadModule_fail;

-    }

-

-    pathlist = InitPathList(path);

-    if (!pathlist) {

-	/* This could be a malloc failure too */

-	if (errmaj)

-	    *errmaj = LDR_BADUSAGE;

-	if (errmin)

-	    *errmin = 1;

-	goto LoadModule_fail;

-    }

-

-    /* 

-     * if the module name is not a full pathname, we need to

-     * check the elements in the path

-     */

-    if (PathIsAbsolute(module))

-	found = xstrdup(module);

-    path_elem = pathlist;

-    while (!found && *path_elem != NULL) {

-	found = FindModule(m, *path_elem, subdirlist, patterns);

-	path_elem++;

-	/*

-	 * When the module name isn't the canonical name, search for the

-	 * former if no match was found for the latter.

-	 */

-	if (!*path_elem && m == name) {

-	    path_elem = pathlist;

-	    m = (char *)module;

-	}

-    }

-

-    /* 

-     * did we find the module?

-     */

-    if (!found) {

-	xf86Msg(X_WARNING, "Warning, couldn't open module %s\n", module);

-	if (errmaj)

-	    *errmaj = LDR_NOENT;

-	if (errmin)

-	    *errmin = 0;

-	goto LoadModule_fail;

-    }

-    ret->handle = LoaderOpen(found, errmaj, errmin);

-    if (ret->handle < 0)

-	goto LoadModule_fail;

-    ret->path = strdup(found);

-

-    /* drop any explicit suffix from the module name */

-    p = strchr(name, '.');

-    if (p)

-        *p = '\0';

-

-    /*

-     * now check if the special data object <modulename>ModuleData is

-     * present.

-     */

-    if (asprintf(&p, "%sModuleData", name) == -1) {

-	p = NULL;

-	if (errmaj)

-	    *errmaj = LDR_NOMEM;

-	if (errmin)

-	    *errmin = 0;

-	goto LoadModule_fail;

-    }

-    initdata = LoaderSymbol(p);

-    if (initdata) {

-	ModuleSetupProc setup;

-	ModuleTearDownProc teardown;

-	XF86ModuleVersionInfo *vers;

-

-	vers = initdata->vers;

-	setup = initdata->setup;

-	teardown = initdata->teardown;

-

-        if (vers) {

-            if (!CheckVersion(module, vers, modreq)) {

-                if (errmaj)

-                    *errmaj = LDR_MISMATCH;

-                if (errmin)

-                    *errmin = 0;

-                goto LoadModule_fail;

-            }

-        } else {

-            xf86Msg(X_ERROR,

-                    "LoadModule: Module %s does not supply"

-                    " version information\n", module);

-            if (errmaj)

-                *errmaj = LDR_INVALID;

-            if (errmin)

-                *errmin = 0;

-            goto LoadModule_fail;

-        }

-	if (setup)

-	    ret->SetupProc = setup;

-	if (teardown)

-	    ret->TearDownProc = teardown;

-	ret->VersionInfo = vers;

-    } else {

-	/* No initdata is OK for external modules */

-	if (options == EXTERN_MODULE)

-	    goto LoadModule_exit;

-

-	/* no initdata, fail the load */

-	xf86Msg(X_ERROR, "LoadModule: Module %s does not have a %s "

-		"data object.\n", module, p);

-	if (errmaj)

-	    *errmaj = LDR_INVALID;

-	if (errmin)

-	    *errmin = 0;

-	goto LoadModule_fail;

-    }

-    if (ret->SetupProc) {

-	ret->TearDownData = ret->SetupProc(ret, options, errmaj, errmin);

-	if (!ret->TearDownData) {

-	    goto LoadModule_fail;

-	}

-    } else if (options) {

-	xf86Msg(X_WARNING, "Module Options present, but no SetupProc "

-		"available for %s\n", module);

-    }

-    goto LoadModule_exit;

-

-  LoadModule_fail:

-    UnloadModule(ret);

-    ret = NULL;

-

-  LoadModule_exit:

-    FreePathList(pathlist);

-    FreePatterns(patterns);

-    free(found);

-    free(name);

-    free(p);

-

-    return ret;

-}

-

-/*

- * LoadModule: load a module

- *

- * module       The module name.  Normally this is not a filename but the

- *              module's "canonical name.  A full pathname is, however,

- *              also accepted.

- * path         A comma separated list of module directories.

- * subdirlist   A NULL terminated list of subdirectories to search.  When

- *              NULL, the default "stdSubdirs" list is used.  The default

- *              list is also substituted for entries with value DEFAULT_LIST.

- * patternlist  A NULL terminated list of regular expressions used to find

- *              module filenames.  Each regex should contain exactly one

- *              subexpression that corresponds to the canonical module name.

- *              When NULL, the default "stdPatterns" list is used.  The

- *              default list is also substituted for entries with value

- *              DEFAULT_LIST.

- * options      A NULL terminated list of Options that are passed to the

- *              module's SetupProc function.

- * modreq       An optional XF86ModReqInfo* containing

- *              version/ABI/vendor-ABI requirements to check for when

- *              loading the module.  The following fields of the

- *              XF86ModReqInfo struct are checked:

- *                majorversion - must match the module's majorversion exactly

- *                minorversion - the module's minorversion must be >= this

- *                patchlevel   - the module's minorversion.patchlevel must be

- *                               >= this.  Patchlevel is ignored when

- *                               minorversion is not set.

- *                abiclass     - (string) must match the module's abiclass

- *                abiversion   - must be consistent with the module's

- *                               abiversion (major equal, minor no older)

- *                moduleclass  - string must match the module's moduleclass

- *                               string

- *              "don't care" values are ~0 for numbers, and NULL for strings

- * errmaj       Major error return.

- * errmin       Minor error return.

- *

- */

-ModuleDescPtr

-LoadModule(const char *module, const char *path, const char **subdirlist,

-	   const char **patternlist, pointer options,

-	   const XF86ModReqInfo * modreq, int *errmaj, int *errmin)

-{

-  return doLoadModule(module, path, subdirlist, patternlist, options,

-		      modreq, errmaj, errmin);

-}

-

-void

-UnloadModule(pointer mod)

-{

-    UnloadModuleOrDriver((ModuleDescPtr)mod);

-}

-

-static void

-UnloadModuleOrDriver(ModuleDescPtr mod)

-{

-    if (mod == (ModuleDescPtr) 1)

-	return;

-

-    if (mod == NULL || mod->name == NULL)

-	return;

-

-    xf86MsgVerb(X_INFO, 3, "UnloadModule: \"%s\"\n", mod->name);

-

-    if ((mod->TearDownProc) && (mod->TearDownData))

-	mod->TearDownProc(mod->TearDownData);

-    LoaderUnload(mod->name, mod->handle);

-

-    if (mod->child)

-	UnloadModuleOrDriver(mod->child);

-    if (mod->sib)

-	UnloadModuleOrDriver(mod->sib);

-    free(mod->path);

-    free(mod->name);

-    free(mod);

-}

-

-void

-UnloadSubModule(pointer _mod)

-{

-    ModuleDescPtr mod = (ModuleDescPtr)_mod;

-

-    if (mod == NULL || mod->name == NULL)

-	return;

-

-    xf86MsgVerb(X_INFO, 3, "UnloadSubModule: \"%s\"\n", mod->name);

-

-    if ((mod->TearDownProc) && (mod->TearDownData))

-	mod->TearDownProc(mod->TearDownData);

-    LoaderUnload(mod->name, mod->handle);

-

-    RemoveChild(mod);

-

-    if (mod->child)

-	UnloadModuleOrDriver(mod->child);

-

-    free(mod->path);

-    free(mod->name);

-    free(mod);

-}

-

-static void

-RemoveChild(ModuleDescPtr child)

-{

-    ModuleDescPtr mdp;

-    ModuleDescPtr prevsib;

-    ModuleDescPtr parent;

-

-    if (!child->parent)

-	return;

-

-    parent = child->parent;

-    if (parent->child == child) {

-	parent->child = child->sib;

-	return;

-    }

-

-    prevsib = parent->child;

-    mdp = prevsib->sib;

-    while (mdp && mdp != child) {

-	prevsib = mdp;

-	mdp = mdp->sib;

-    }

-    if (mdp == child)

-	prevsib->sib = child->sib;

-    return;

-}

-

-void

-LoaderErrorMsg(const char *name, const char *modname, int errmaj, int errmin)

-{

-    const char *msg;

-    MessageType type = X_ERROR;

-

-    switch (errmaj) {

-    case LDR_NOERROR:

-	msg = "no error";

-	break;

-    case LDR_NOMEM:

-	msg = "out of memory";

-	break;

-    case LDR_NOENT:

-	msg = "module does not exist";

-	break;

-    case LDR_NOSUBENT:

-	msg = "a required submodule could not be loaded";

-	break;

-    case LDR_NOSPACE:

-	msg = "too many modules";

-	break;

-    case LDR_NOMODOPEN:

-	msg = "open failed";

-	break;

-    case LDR_UNKTYPE:

-	msg = "unknown module type";

-	break;

-    case LDR_NOLOAD:

-	msg = "loader failed";

-	break;

-    case LDR_ONCEONLY:

-	msg = "already loaded";

-        type = X_INFO;

-	break;

-    case LDR_NOPORTOPEN:

-	msg = "port open failed";

-	break;

-    case LDR_NOHARDWARE:

-	msg = "no hardware found";

-	break;

-    case LDR_MISMATCH:

-	msg = "module requirement mismatch";

-	break;

-    case LDR_BADUSAGE:

-	msg = "invalid argument(s) to LoadModule()";

-	break;

-    case LDR_INVALID:

-	msg = "invalid module";

-	break;

-    case LDR_BADOS:

-	msg = "module doesn't support this OS";

-	break;

-    case LDR_MODSPECIFIC:

-	msg = "module-specific error";

-	break;

-    default:

-	msg = "unknown error";

-    }

-    if (name)

-	xf86Msg(type, "%s: Failed to load module \"%s\" (%s, %d)\n",

-		name, modname, msg, errmin);

-    else

-	xf86Msg(type, "Failed to load module \"%s\" (%s, %d)\n",

-		modname, msg, errmin);

-}

-

-/* Given a module path or file name, return the module's canonical name */

-static char *

-LoaderGetCanonicalName(const char *modname, PatternPtr patterns)

-{

-    char *str;

-    const char *s;

-    int len;

-    PatternPtr p;

-    regmatch_t match[2];

-

-    /* Strip off any leading path */

-    s = strrchr(modname, '/');

-    if (s == NULL)

-	s = modname;

-    else

-	s++;

-

-    /* Find the first regex that is matched */

-    for (p = patterns; p->pattern; p++)

-	if (regexec(&p->rex, s, 2, match, 0) == 0 && match[1].rm_so != -1) {

-	    len = match[1].rm_eo - match[1].rm_so;

-	    str = malloc(len + 1);

-	    if (!str)

-		return NULL;

-	    strncpy(str, s + match[1].rm_so, len);

-	    str[len] = '\0';

-	    return str;

-	}

-

-    /* If there is no match, return the whole name minus the leading path */

-    return strdup(s);

-}

-

-/*

- * Return the module version information.

- */

-unsigned long

-LoaderGetModuleVersion(ModuleDescPtr mod)

-{

-    if (!mod || mod == (ModuleDescPtr) 1 || !mod->VersionInfo)

-	return 0;

-

-    return MODULE_VERSION_NUMERIC(mod->VersionInfo->majorversion,

-				  mod->VersionInfo->minorversion,

-				  mod->VersionInfo->patchlevel);

-}

+/*
+ * Copyright 1995-1998 by Metro Link, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of Metro Link, Inc. not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Metro Link, Inc. makes no
+ * representations about the suitability of this software for any purpose.
+ *  It is provided "as is" without express or implied warranty.
+ *
+ * METRO LINK, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL METRO LINK, INC. 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.
+ */
+/*
+ * Copyright (c) 1997-2002 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 "os.h"
+/* For stat() and related stuff */
+#define NO_OSLIB_PROTOTYPES
+#include "xf86_OSlib.h"
+#define LOADERDECLARATIONS
+#include "loaderProcs.h"
+#include "misc.h"
+#include "xf86.h"
+#include "xf86Priv.h"
+#include "xf86Xinput.h"
+#include "loader.h"
+#include "xf86Optrec.h"
+
+#include <sys/types.h>
+#include <regex.h>
+#include <dirent.h>
+#include <limits.h>
+
+typedef struct _pattern {
+    const char *pattern;
+    regex_t rex;
+} PatternRec, *PatternPtr;
+
+/* Prototypes for static functions */
+static char *FindModule(const char *, const char *, const char **,
+			PatternPtr);
+static Bool CheckVersion(const char *, XF86ModuleVersionInfo *,
+			 const XF86ModReqInfo *);
+static void UnloadModuleOrDriver(ModuleDescPtr mod);
+static char *LoaderGetCanonicalName(const char *, PatternPtr);
+static void RemoveChild(ModuleDescPtr);
+static ModuleDescPtr doLoadModule(const char *, const char *, const char **,
+				  const char **, pointer,
+				  const XF86ModReqInfo *, int *, int *);
+
+const ModuleVersions LoaderVersionInfo = {
+    XORG_VERSION_CURRENT,
+    ABI_ANSIC_VERSION,
+    ABI_VIDEODRV_VERSION,
+    ABI_XINPUT_VERSION,
+    ABI_EXTENSION_VERSION,
+    ABI_FONT_VERSION
+};
+
+static void
+FreeStringList(char **paths)
+{
+    char **p;
+
+    if (!paths)
+	return;
+
+    for (p = paths; *p; p++)
+	free(*p);
+
+    free(paths);
+}
+
+static char **defaultPathList = NULL;
+
+static Bool
+PathIsAbsolute(const char *path)
+{
+    return *path == '/';
+}	
+
+/*
+ * Convert a comma-separated path into a NULL-terminated array of path
+ * elements, rejecting any that are not full absolute paths, and appending
+ * a '/' when it isn't already present.
+ */
+static char **
+InitPathList(const char *path)
+{
+    char *fullpath = NULL;
+    char *elem = NULL;
+    char **list = NULL, **save = NULL;
+    int len;
+    int addslash;
+    int n = 0;
+
+    if (!path)
+	return defaultPathList;
+
+    fullpath = strdup(path);
+    if (!fullpath)
+	return NULL;
+    elem = strtok(fullpath, ",");
+    while (elem) {
+	if (PathIsAbsolute(elem))
+	{
+	    len = strlen(elem);
+	    addslash = (elem[len - 1] != '/');
+	    if (addslash)
+		len++;
+	    save = list;
+	    list = realloc(list, (n + 2) * sizeof(char *));
+	    if (!list) {
+		if (save) {
+		    save[n] = NULL;
+		    FreeStringList(save);
+		}
+		free(fullpath);
+		return NULL;
+	    }
+	    list[n] = malloc(len + 1);
+	    if (!list[n]) {
+		FreeStringList(list);
+		free(fullpath);
+		return NULL;
+	    }
+	    strcpy(list[n], elem);
+	    if (addslash) {
+		list[n][len - 1] = '/';
+		list[n][len] = '\0';
+	    }
+	    n++;
+	}
+	elem = strtok(NULL, ",");
+    }
+    if (list)
+	list[n] = NULL;
+    free(fullpath);
+    return list;
+}
+
+static void
+FreePathList(char **pathlist)
+{
+    if (pathlist && pathlist != defaultPathList)
+	FreeStringList(pathlist);
+}
+
+void
+LoaderSetPath(const char *path)
+{
+    if (!path)
+	return;
+
+    defaultPathList = InitPathList(path);
+}
+
+/* Standard set of module subdirectories to search, in order of preference */
+static const char *stdSubdirs[] = {
+    "",
+    "input/",
+    "drivers/",
+    "multimedia/",
+    "extensions/",
+    "internal/",
+    NULL
+};
+
+/*
+ * Standard set of module name patterns to check, in order of preference
+ * These are regular expressions (suitable for use with POSIX regex(3)).
+ *
+ * This list assumes that you're an ELFish platform and therefore your
+ * shared libraries are named something.so.  If we're ever nuts enough
+ * to port this DDX to, say, Darwin, we'll need to fix this.
+ */
+static PatternRec stdPatterns[] = {
+    {"^lib(.*)\\.so$",},
+    {"(.*)_drv\\.so$",},
+    {"(.*)\\.so$",},
+    {NULL,}
+};
+
+static PatternPtr
+InitPatterns(const char **patternlist)
+{
+    char errmsg[80];
+    int i, e;
+    PatternPtr patterns = NULL;
+    PatternPtr p = NULL;
+    static int firstTime = 1;
+    const char **s;
+
+    if (firstTime) {
+	/* precompile stdPatterns */
+	firstTime = 0;
+	for (p = stdPatterns; p->pattern; p++)
+	    if ((e = regcomp(&p->rex, p->pattern, REG_EXTENDED)) != 0) {
+		regerror(e, &p->rex, errmsg, sizeof(errmsg));
+		FatalError("InitPatterns: regcomp error for `%s': %s\n",
+			   p->pattern, errmsg);
+	    }
+    }
+
+    if (patternlist) {
+	for (i = 0, s = patternlist; *s; i++, s++)
+	    if (*s == DEFAULT_LIST)
+		i += sizeof(stdPatterns) / sizeof(stdPatterns[0]) - 1 - 1;
+	patterns = malloc((i + 1) * sizeof(PatternRec));
+	if (!patterns) {
+	    return NULL;
+	}
+	for (i = 0, s = patternlist; *s; i++, s++)
+	    if (*s != DEFAULT_LIST) {
+		p = patterns + i;
+		p->pattern = *s;
+		if ((e = regcomp(&p->rex, p->pattern, REG_EXTENDED)) != 0) {
+		    regerror(e, &p->rex, errmsg, sizeof(errmsg));
+		    ErrorF("InitPatterns: regcomp error for `%s': %s\n",
+			   p->pattern, errmsg);
+		    i--;
+		}
+	    } else {
+		for (p = stdPatterns; p->pattern; p++, i++)
+		    patterns[i] = *p;
+		if (p != stdPatterns)
+		    i--;
+	    }
+	patterns[i].pattern = NULL;
+    } else
+	patterns = stdPatterns;
+    return patterns;
+}
+
+static void
+FreePatterns(PatternPtr patterns)
+{
+    if (patterns && patterns != stdPatterns)
+	free(patterns);
+}
+
+static const char **
+InitSubdirs(const char **subdirlist)
+{
+    int i;
+    const char **tmp_subdirlist = NULL;
+    char **subdirs = NULL;
+    const char **s, **stmp = NULL;
+    const char *osname;
+    const char *slash;
+    int oslen = 0, len;
+    Bool indefault;
+
+    if (subdirlist == NULL) {
+	subdirlist = tmp_subdirlist = malloc(2 * sizeof(char *));
+	if (subdirlist == NULL)
+	    return NULL;
+	subdirlist[0] = DEFAULT_LIST;
+	subdirlist[1] = NULL;
+    }
+
+    LoaderGetOS(&osname, NULL, NULL, NULL);
+    oslen = strlen(osname);
+
+    {
+	/* Count number of entries and check for invalid paths */
+	for (i = 0, s = subdirlist; *s; i++, s++) {
+	    if (*s == DEFAULT_LIST) {
+		i += sizeof(stdSubdirs) / sizeof(stdSubdirs[0]) - 1 - 1;
+	    } else {
+		/*
+		 * Path validity check.  Don't allow absolute paths, or
+		 * paths containing "..".  To catch absolute paths on
+		 * platforms that use driver letters, don't allow the ':'
+		 * character to appear at all.
+		 */
+		if (**s == '/' || **s == '\\' || strchr(*s, ':') ||
+		    strstr(*s, "..")) {
+		    xf86Msg(X_ERROR, "InitSubdirs: Bad subdir: \"%s\"\n", *s);
+		    free(tmp_subdirlist);
+		    return NULL;
+		}
+	    }
+	}
+	subdirs = malloc((i * 2 + 1) * sizeof(char *));
+	if (!subdirs) {
+	    free(tmp_subdirlist);
+	    return NULL;
+	}
+	i = 0;
+	s = subdirlist;
+	indefault = FALSE;
+	while (*s) {
+	    if (*s == DEFAULT_LIST) {
+		/* Divert to the default list */
+		indefault = TRUE;
+		stmp = ++s;
+		s = stdSubdirs;
+	    }
+	    len = strlen(*s);
+	    if (**s && (*s)[len - 1] != '/') {
+		slash = "/";
+		len++;
+	    } else
+		slash = "";
+	    len += oslen + 2;
+	    if (!(subdirs[i] = malloc(len))) {
+		while (--i >= 0)
+		    free(subdirs[i]);
+		free(subdirs);
+		free(tmp_subdirlist);
+		return NULL;
+	    }
+	    /* tack on the OS name */
+	    sprintf(subdirs[i], "%s%s%s/", *s, slash, osname);
+	    i++;
+	    /* path as given */
+	    subdirs[i] = strdup(*s);
+	    i++;
+	    s++;
+	    if (indefault && !s) {
+		/* revert back to the main list */
+		indefault = FALSE;
+		s = stmp;
+	    }
+	}
+	subdirs[i] = NULL;
+    }
+    free(tmp_subdirlist);
+    return (const char **)subdirs;
+}
+
+static void
+FreeSubdirs(const char **subdirs)
+{
+    const char **s;
+
+    if (subdirs) {
+	for (s = subdirs; *s; s++)
+	    free((char *)*s);
+	free(subdirs);
+    }
+}
+
+static char *
+FindModuleInSubdir(const char *dirpath, const char *module)
+{
+    struct dirent *direntry = NULL;
+    DIR *dir = NULL;
+    char *ret = NULL, tmpBuf[PATH_MAX];
+    struct stat stat_buf;
+
+    dir = opendir(dirpath);
+    if (!dir)
+        return NULL;
+
+    while ((direntry = readdir(dir))) {
+        if (direntry->d_name[0] == '.')
+            continue;
+        snprintf(tmpBuf, PATH_MAX, "%s%s/", dirpath, direntry->d_name);
+	/* the stat with the appended / fails for normal files,
+	   and works for sub dirs fine, looks a bit strange in strace
+	   but does seem to work */
+        if ((stat(tmpBuf, &stat_buf) == 0) && S_ISDIR(stat_buf.st_mode)) {
+            if ((ret = FindModuleInSubdir(tmpBuf, module)))
+                break;
+            continue;
+        }
+ 
+        snprintf(tmpBuf, PATH_MAX, "lib%s.so", module);
+        if (strcmp(direntry->d_name, tmpBuf) == 0) {
+            if (asprintf(&ret, "%s%s", dirpath, tmpBuf) == -1)
+		ret = NULL;
+            break;
+        }
+
+        snprintf(tmpBuf, PATH_MAX, "%s_drv.so", module);
+        if (strcmp(direntry->d_name, tmpBuf) == 0) {
+            if (asprintf(&ret, "%s%s", dirpath, tmpBuf) == -1)
+		ret = NULL;
+            break;
+        }
+
+        snprintf(tmpBuf, PATH_MAX, "%s.so", module);
+        if (strcmp(direntry->d_name, tmpBuf) == 0) {
+            if (asprintf(&ret, "%s%s", dirpath, tmpBuf) == -1)
+		ret = NULL;
+            break;
+        }
+    }
+    
+    closedir(dir);
+    return ret;
+}
+
+static char *
+FindModule(const char *module, const char *dirname, const char **subdirlist,
+	   PatternPtr patterns)
+{
+    char buf[PATH_MAX + 1];
+    char *dirpath = NULL;
+    char *name = NULL;
+    int dirlen;
+    const char **subdirs = NULL;
+    const char **s;
+
+    dirpath = (char *)dirname;
+    if (strlen(dirpath) > PATH_MAX)
+	return NULL;
+    
+    subdirs = InitSubdirs(subdirlist);
+    if (!subdirs)
+	return NULL;
+
+    for (s = subdirs; *s; s++) {
+	if ((dirlen = strlen(dirpath) + strlen(*s)) > PATH_MAX)
+	    continue;
+	strcpy(buf, dirpath);
+	strcat(buf, *s);
+        if ((name = FindModuleInSubdir(buf, module)))
+            break;
+    }
+
+    FreeSubdirs(subdirs);
+    if (dirpath != dirname)
+	free(dirpath);
+
+    return name;
+}
+
+char **
+LoaderListDirs(const char **subdirlist, const char **patternlist)
+{
+    char buf[PATH_MAX + 1];
+    char **pathlist;
+    char **elem;
+    const char **subdirs;
+    const char **s;
+    PatternPtr patterns;
+    PatternPtr p;
+    DIR *d;
+    struct dirent *dp;
+    regmatch_t match[2];
+    struct stat stat_buf;
+    int len, dirlen;
+    char *fp;
+    char **listing = NULL;
+    char **save;
+    int n = 0;
+
+    if (!(pathlist = InitPathList(NULL)))
+	return NULL;
+    if (!(subdirs = InitSubdirs(subdirlist))) {
+	FreePathList(pathlist);
+	return NULL;
+    }
+    if (!(patterns = InitPatterns(patternlist))) {
+	FreePathList(pathlist);
+	FreeSubdirs(subdirs);
+	return NULL;
+    }
+
+    for (elem = pathlist; *elem; elem++) {
+	for (s = subdirs; *s; s++) {
+	    if ((dirlen = strlen(*elem) + strlen(*s)) > PATH_MAX)
+		continue;
+	    strcpy(buf, *elem);
+	    strcat(buf, *s);
+	    fp = buf + dirlen;
+	    if (stat(buf, &stat_buf) == 0 && S_ISDIR(stat_buf.st_mode) &&
+		(d = opendir(buf))) {
+		if (buf[dirlen - 1] != '/') {
+		    buf[dirlen++] = '/';
+		    fp++;
+		}
+		while ((dp = readdir(d))) {
+		    if (dirlen + strlen(dp->d_name) > PATH_MAX)
+			continue;
+		    strcpy(fp, dp->d_name);
+		    if (!(stat(buf, &stat_buf) == 0 &&
+			  S_ISREG(stat_buf.st_mode)))
+			continue;
+		    for (p = patterns; p->pattern; p++) {
+			if (regexec(&p->rex, dp->d_name, 2, match, 0) == 0 &&
+			    match[1].rm_so != -1) {
+			    len = match[1].rm_eo - match[1].rm_so;
+			    save = listing;
+			    listing = realloc(listing,
+					       (n + 2) * sizeof(char *));
+			    if (!listing) {
+				if (save) {
+				    save[n] = NULL;
+				    FreeStringList(save);
+				}
+				FreePathList(pathlist);
+				FreeSubdirs(subdirs);
+				FreePatterns(patterns);
+				closedir(d);
+				return NULL;
+			    }
+			    listing[n] = malloc(len + 1);
+			    if (!listing[n]) {
+				FreeStringList(listing);
+				FreePathList(pathlist);
+				FreeSubdirs(subdirs);
+				FreePatterns(patterns);
+				closedir(d);
+				return NULL;
+			    }
+			    strncpy(listing[n], dp->d_name + match[1].rm_so,
+				    len);
+			    listing[n][len] = '\0';
+			    n++;
+			    break;
+			}
+		    }
+		}
+		closedir(d);
+	    }
+	}
+    }
+    if (listing)
+	listing[n] = NULL;
+
+    FreePathList(pathlist);
+    FreeSubdirs(subdirs);
+    FreePatterns(patterns);
+    return listing;
+}
+
+void
+LoaderFreeDirList(char **list)
+{
+    FreeStringList(list);
+}
+
+static Bool
+CheckVersion(const char *module, XF86ModuleVersionInfo * data,
+	     const XF86ModReqInfo * req)
+{
+    int vercode[4];
+    char verstr[4];
+    long ver = data->xf86version;
+    MessageType errtype;
+
+    xf86Msg(X_INFO, "Module %s: vendor=\"%s\"\n",
+	    data->modname ? data->modname : "UNKNOWN!",
+	    data->vendor ? data->vendor : "UNKNOWN!");
+
+    /* Check for the different scheme used in XFree86 4.0.x releases:
+     * ((((((((major << 7) | minor) << 7) | subminor) << 5) | beta) << 5) | alpha)
+     * Since it wasn't used in 4.1.0 or later, limit to versions in the 4.0.x
+     * range, which limits the overlap with the new version scheme to conflicts
+     * with 6.71.8.764 through 6.72.39.934.
+     */
+    if ((ver > (4 << 24)) && (ver < ( (4 << 24) + (1 << 17)))) {
+	/* 4.0.x and earlier */
+	verstr[1] = verstr[3] = 0;
+	verstr[2] = (ver & 0x1f) ? (ver & 0x1f) + 'a' - 1 : 0;
+	ver >>= 5;
+	verstr[0] = (ver & 0x1f) ? (ver & 0x1f) + 'A' - 1 : 0;
+	ver >>= 5;
+	vercode[2] = ver & 0x7f;
+	ver >>= 7;
+	vercode[1] = ver & 0x7f;
+	ver >>= 7;
+	vercode[0] = ver;
+	xf86ErrorF("\tcompiled for %d.%d", vercode[0], vercode[1]);
+	if (vercode[2] != 0)
+	    xf86ErrorF(".%d", vercode[2]);
+	xf86ErrorF("%s%s, module version = %d.%d.%d\n", verstr, verstr + 2,
+		   data->majorversion, data->minorversion, data->patchlevel);
+    } else {
+	vercode[0] = ver / 10000000;
+	vercode[1] = (ver / 100000) % 100;
+	vercode[2] = (ver / 1000) % 100;
+	vercode[3] = ver % 1000;
+	xf86ErrorF("\tcompiled for %d.%d.%d", vercode[0], vercode[1],
+		   vercode[2]);
+	if (vercode[3] != 0)
+	    xf86ErrorF(".%d", vercode[3]);
+	xf86ErrorF(", module version = %d.%d.%d\n", data->majorversion,
+		   data->minorversion, data->patchlevel);
+    }
+
+    if (data->moduleclass)
+	xf86ErrorFVerb(2, "\tModule class: %s\n", data->moduleclass);
+
+    ver = -1;
+    if (data->abiclass) {
+	int abimaj, abimin;
+	int vermaj, vermin;
+
+	if (!strcmp(data->abiclass, ABI_CLASS_ANSIC))
+	    ver = LoaderVersionInfo.ansicVersion;
+	else if (!strcmp(data->abiclass, ABI_CLASS_VIDEODRV))
+	    ver = LoaderVersionInfo.videodrvVersion;
+	else if (!strcmp(data->abiclass, ABI_CLASS_XINPUT))
+	    ver = LoaderVersionInfo.xinputVersion;
+	else if (!strcmp(data->abiclass, ABI_CLASS_EXTENSION))
+	    ver = LoaderVersionInfo.extensionVersion;
+	else if (!strcmp(data->abiclass, ABI_CLASS_FONT))
+	    ver = LoaderVersionInfo.fontVersion;
+
+	abimaj = GET_ABI_MAJOR(data->abiversion);
+	abimin = GET_ABI_MINOR(data->abiversion);
+	xf86ErrorFVerb(2, "\tABI class: %s, version %d.%d\n",
+		       data->abiclass, abimaj, abimin);
+	if (ver != -1) {
+	    vermaj = GET_ABI_MAJOR(ver);
+	    vermin = GET_ABI_MINOR(ver);
+	    if (abimaj != vermaj) {
+		if (LoaderOptions & LDR_OPT_ABI_MISMATCH_NONFATAL)
+		    errtype = X_WARNING;
+		else
+		    errtype = X_ERROR;
+		xf86MsgVerb(errtype, 0,
+			    "module ABI major version (%d) doesn't"
+			    " match the server's version (%d)\n",
+			    abimaj, vermaj);
+		if (!(LoaderOptions & LDR_OPT_ABI_MISMATCH_NONFATAL))
+		    return FALSE;
+	    } else if (abimin > vermin) {
+		if (LoaderOptions & LDR_OPT_ABI_MISMATCH_NONFATAL)
+		    errtype = X_WARNING;
+		else
+		    errtype = X_ERROR;
+		xf86MsgVerb(errtype, 0,
+			    "module ABI minor version (%d) is "
+			    "newer than the server's version "
+			    "(%d)\n", abimin, vermin);
+		if (!(LoaderOptions & LDR_OPT_ABI_MISMATCH_NONFATAL))
+		    return FALSE;
+	    }
+	}
+    }
+
+    /* Check against requirements that the caller has specified */
+    if (req) {
+	if (req->majorversion != MAJOR_UNSPEC) {
+	    if (data->majorversion != req->majorversion) {
+		xf86MsgVerb(X_WARNING, 2, "module major version (%d) "
+			    "doesn't match required major version (%d)\n",
+			    data->majorversion, req->majorversion);
+		return FALSE;
+	    } else if (req->minorversion != MINOR_UNSPEC) {
+		if (data->minorversion < req->minorversion) {
+		    xf86MsgVerb(X_WARNING, 2, "module minor version (%d) "
+				"is less than the required minor version (%d)\n",
+				data->minorversion, req->minorversion);
+		    return FALSE;
+		} else if (data->minorversion == req->minorversion &&
+			   req->patchlevel != PATCH_UNSPEC) {
+		    if (data->patchlevel < req->patchlevel) {
+			xf86MsgVerb(X_WARNING, 2, "module patch level (%d) "
+				    "is less than the required patch level (%d)\n",
+				    data->patchlevel, req->patchlevel);
+			return FALSE;
+		    }
+		}
+	    }
+	}
+	if (req->moduleclass) {
+	    if (!data->moduleclass ||
+		strcmp(req->moduleclass, data->moduleclass)) {
+		xf86MsgVerb(X_WARNING, 2, "Module class (%s) doesn't match "
+			    "the required class (%s)\n",
+			    data->moduleclass ? data->moduleclass : "<NONE>",
+			    req->moduleclass);
+		return FALSE;
+	    }
+	} else if (req->abiclass != ABI_CLASS_NONE) {
+	    if (!data->abiclass || strcmp(req->abiclass, data->abiclass)) {
+		xf86MsgVerb(X_WARNING, 2, "ABI class (%s) doesn't match the "
+			    "required ABI class (%s)\n",
+			    data->abiclass ? data->abiclass : "<NONE>",
+			    req->abiclass);
+		return FALSE;
+	    }
+	}
+	if ((req->abiclass != ABI_CLASS_NONE) &&
+	    req->abiversion != ABI_VERS_UNSPEC) {
+	    int reqmaj, reqmin, maj, min;
+
+	    reqmaj = GET_ABI_MAJOR(req->abiversion);
+	    reqmin = GET_ABI_MINOR(req->abiversion);
+	    maj = GET_ABI_MAJOR(data->abiversion);
+	    min = GET_ABI_MINOR(data->abiversion);
+	    if (maj != reqmaj) {
+		xf86MsgVerb(X_WARNING, 2, "ABI major version (%d) doesn't "
+			    "match the required ABI major version (%d)\n",
+			    maj, reqmaj);
+		return FALSE;
+	    }
+	    /* XXX Maybe this should be the other way around? */
+	    if (min > reqmin) {
+		xf86MsgVerb(X_WARNING, 2, "module ABI minor version (%d) "
+			    "is newer than that available (%d)\n", min, reqmin);
+		return FALSE;
+	    }
+	}
+    }
+    return TRUE;
+}
+
+static ModuleDescPtr
+AddSibling(ModuleDescPtr head, ModuleDescPtr new)
+{
+    new->sib = head;
+    return new;
+}
+
+pointer
+LoadSubModule(pointer _parent, const char *module,
+	      const char **subdirlist, const char **patternlist,
+	      pointer options, const XF86ModReqInfo * modreq,
+	      int *errmaj, int *errmin)
+{
+    ModuleDescPtr submod;
+    ModuleDescPtr parent = (ModuleDescPtr)_parent;
+
+    xf86MsgVerb(X_INFO, 3, "Loading sub module \"%s\"\n", module);
+
+    if (PathIsAbsolute(module)) {
+	xf86Msg(X_ERROR,
+		"LoadSubModule: Absolute module path not permitted: \"%s\"\n",
+		module);
+	if (errmaj)
+	    *errmaj = LDR_BADUSAGE;
+	if (errmin)
+	    *errmin = 0;
+	return NULL;
+    }
+
+    submod = doLoadModule(module, NULL, subdirlist, patternlist, options,
+			  modreq, errmaj, errmin);
+    if (submod && submod != (ModuleDescPtr) 1) {
+	parent->child = AddSibling(parent->child, submod);
+	submod->parent = parent;
+    }
+    return submod;
+}
+
+static ModuleDescPtr
+NewModuleDesc(const char *name)
+{
+    ModuleDescPtr mdp = calloc(1, sizeof(ModuleDesc));
+
+    if (mdp)
+	mdp->name = xstrdup(name);
+
+    return mdp;
+}
+
+ModuleDescPtr
+DuplicateModule(ModuleDescPtr mod, ModuleDescPtr parent)
+{
+    ModuleDescPtr ret;
+    int errmaj, errmin;
+
+    if (!mod)
+	return NULL;
+
+    ret = NewModuleDesc(mod->name);
+    if (ret == NULL)
+	return NULL;
+
+    if (!(ret->handle = LoaderOpen(mod->path, &errmaj, &errmin))) {
+        free(ret);
+        return NULL;
+    }
+
+    ret->SetupProc = mod->SetupProc;
+    ret->TearDownProc = mod->TearDownProc;
+    ret->TearDownData = NULL;
+    ret->child = DuplicateModule(mod->child, ret);
+    ret->sib = DuplicateModule(mod->sib, parent);
+    ret->parent = parent;
+    ret->VersionInfo = mod->VersionInfo;
+    ret->path = strdup(mod->path);
+
+    return ret;
+}
+
+static const char *compiled_in_modules[] = {
+    "ddc",
+    "i2c",
+    "ramdac",
+    NULL
+};
+
+static ModuleDescPtr
+doLoadModule(const char *module, const char *path, const char **subdirlist,
+	     const char **patternlist, pointer options,
+	     const XF86ModReqInfo * modreq,
+	     int *errmaj, int *errmin)
+{
+    XF86ModuleData *initdata = NULL;
+    char **pathlist = NULL;
+    char *found = NULL;
+    char *name = NULL;
+    char **path_elem = NULL;
+    char *p = NULL;
+    ModuleDescPtr ret = NULL;
+    PatternPtr patterns = NULL;
+    int noncanonical = 0;
+    char *m = NULL;
+    const char **cim;
+
+    xf86MsgVerb(X_INFO, 3, "LoadModule: \"%s\"", module);
+
+    patterns = InitPatterns(patternlist);
+    name = LoaderGetCanonicalName(module, patterns);
+    noncanonical = (name && strcmp(module, name) != 0);
+    if (noncanonical) {
+	xf86ErrorFVerb(3, " (%s)\n", name);
+	xf86MsgVerb(X_WARNING, 1,
+		    "LoadModule: given non-canonical module name \"%s\"\n",
+		    module);
+	m = name;
+    } else {
+	xf86ErrorFVerb(3, "\n");
+	m = (char *)module;
+    }
+
+    for (cim = compiled_in_modules; *cim; cim++)
+	if (!strcmp (m, *cim))
+	{
+	    xf86MsgVerb(X_INFO, 3, "Module \"%s\" already built-in\n", m);
+	    ret = (ModuleDescPtr) 1;
+	    goto LoadModule_exit;
+	}
+
+    if (!name) {
+	if (errmaj)
+	    *errmaj = LDR_BADUSAGE;
+	if (errmin)
+	    *errmin = 0;
+	goto LoadModule_fail;
+    }
+    ret = NewModuleDesc(name);
+    if (!ret) {
+	if (errmaj)
+	    *errmaj = LDR_NOMEM;
+	if (errmin)
+	    *errmin = 0;
+	goto LoadModule_fail;
+    }
+
+    pathlist = InitPathList(path);
+    if (!pathlist) {
+	/* This could be a malloc failure too */
+	if (errmaj)
+	    *errmaj = LDR_BADUSAGE;
+	if (errmin)
+	    *errmin = 1;
+	goto LoadModule_fail;
+    }
+
+    /* 
+     * if the module name is not a full pathname, we need to
+     * check the elements in the path
+     */
+    if (PathIsAbsolute(module))
+	found = xstrdup(module);
+    path_elem = pathlist;
+    while (!found && *path_elem != NULL) {
+	found = FindModule(m, *path_elem, subdirlist, patterns);
+	path_elem++;
+	/*
+	 * When the module name isn't the canonical name, search for the
+	 * former if no match was found for the latter.
+	 */
+	if (!*path_elem && m == name) {
+	    path_elem = pathlist;
+	    m = (char *)module;
+	}
+    }
+
+    /* 
+     * did we find the module?
+     */
+    if (!found) {
+	xf86Msg(X_WARNING, "Warning, couldn't open module %s\n", module);
+	if (errmaj)
+	    *errmaj = LDR_NOENT;
+	if (errmin)
+	    *errmin = 0;
+	goto LoadModule_fail;
+    }
+    ret->handle = LoaderOpen(found, errmaj, errmin);
+    if (ret->handle < 0)
+	goto LoadModule_fail;
+    ret->path = strdup(found);
+
+    /* drop any explicit suffix from the module name */
+    p = strchr(name, '.');
+    if (p)
+        *p = '\0';
+
+    /*
+     * now check if the special data object <modulename>ModuleData is
+     * present.
+     */
+    if (asprintf(&p, "%sModuleData", name) == -1) {
+	p = NULL;
+	if (errmaj)
+	    *errmaj = LDR_NOMEM;
+	if (errmin)
+	    *errmin = 0;
+	goto LoadModule_fail;
+    }
+    initdata = LoaderSymbol(p);
+    if (initdata) {
+	ModuleSetupProc setup;
+	ModuleTearDownProc teardown;
+	XF86ModuleVersionInfo *vers;
+
+	vers = initdata->vers;
+	setup = initdata->setup;
+	teardown = initdata->teardown;
+
+        if (vers) {
+            if (!CheckVersion(module, vers, modreq)) {
+                if (errmaj)
+                    *errmaj = LDR_MISMATCH;
+                if (errmin)
+                    *errmin = 0;
+                goto LoadModule_fail;
+            }
+        } else {
+            xf86Msg(X_ERROR,
+                    "LoadModule: Module %s does not supply"
+                    " version information\n", module);
+            if (errmaj)
+                *errmaj = LDR_INVALID;
+            if (errmin)
+                *errmin = 0;
+            goto LoadModule_fail;
+        }
+	if (setup)
+	    ret->SetupProc = setup;
+	if (teardown)
+	    ret->TearDownProc = teardown;
+	ret->VersionInfo = vers;
+    } else {
+	/* No initdata is OK for external modules */
+	if (options == EXTERN_MODULE)
+	    goto LoadModule_exit;
+
+	/* no initdata, fail the load */
+	xf86Msg(X_ERROR, "LoadModule: Module %s does not have a %s "
+		"data object.\n", module, p);
+	if (errmaj)
+	    *errmaj = LDR_INVALID;
+	if (errmin)
+	    *errmin = 0;
+	goto LoadModule_fail;
+    }
+    if (ret->SetupProc) {
+	ret->TearDownData = ret->SetupProc(ret, options, errmaj, errmin);
+	if (!ret->TearDownData) {
+	    goto LoadModule_fail;
+	}
+    } else if (options) {
+	xf86Msg(X_WARNING, "Module Options present, but no SetupProc "
+		"available for %s\n", module);
+    }
+    goto LoadModule_exit;
+
+  LoadModule_fail:
+    UnloadModule(ret);
+    ret = NULL;
+
+  LoadModule_exit:
+    FreePathList(pathlist);
+    FreePatterns(patterns);
+    free(found);
+    free(name);
+    free(p);
+
+    return ret;
+}
+
+/*
+ * LoadModule: load a module
+ *
+ * module       The module name.  Normally this is not a filename but the
+ *              module's "canonical name.  A full pathname is, however,
+ *              also accepted.
+ * path         A comma separated list of module directories.
+ * subdirlist   A NULL terminated list of subdirectories to search.  When
+ *              NULL, the default "stdSubdirs" list is used.  The default
+ *              list is also substituted for entries with value DEFAULT_LIST.
+ * patternlist  A NULL terminated list of regular expressions used to find
+ *              module filenames.  Each regex should contain exactly one
+ *              subexpression that corresponds to the canonical module name.
+ *              When NULL, the default "stdPatterns" list is used.  The
+ *              default list is also substituted for entries with value
+ *              DEFAULT_LIST.
+ * options      A NULL terminated list of Options that are passed to the
+ *              module's SetupProc function.
+ * modreq       An optional XF86ModReqInfo* containing
+ *              version/ABI/vendor-ABI requirements to check for when
+ *              loading the module.  The following fields of the
+ *              XF86ModReqInfo struct are checked:
+ *                majorversion - must match the module's majorversion exactly
+ *                minorversion - the module's minorversion must be >= this
+ *                patchlevel   - the module's minorversion.patchlevel must be
+ *                               >= this.  Patchlevel is ignored when
+ *                               minorversion is not set.
+ *                abiclass     - (string) must match the module's abiclass
+ *                abiversion   - must be consistent with the module's
+ *                               abiversion (major equal, minor no older)
+ *                moduleclass  - string must match the module's moduleclass
+ *                               string
+ *              "don't care" values are ~0 for numbers, and NULL for strings
+ * errmaj       Major error return.
+ * errmin       Minor error return.
+ *
+ */
+ModuleDescPtr
+LoadModule(const char *module, const char *path, const char **subdirlist,
+	   const char **patternlist, pointer options,
+	   const XF86ModReqInfo * modreq, int *errmaj, int *errmin)
+{
+  return doLoadModule(module, path, subdirlist, patternlist, options,
+		      modreq, errmaj, errmin);
+}
+
+void
+UnloadModule(pointer mod)
+{
+    UnloadModuleOrDriver((ModuleDescPtr)mod);
+}
+
+static void
+UnloadModuleOrDriver(ModuleDescPtr mod)
+{
+    if (mod == (ModuleDescPtr) 1)
+	return;
+
+    if (mod == NULL || mod->name == NULL)
+	return;
+
+    xf86MsgVerb(X_INFO, 3, "UnloadModule: \"%s\"\n", mod->name);
+
+    if ((mod->TearDownProc) && (mod->TearDownData))
+	mod->TearDownProc(mod->TearDownData);
+    LoaderUnload(mod->name, mod->handle);
+
+    if (mod->child)
+	UnloadModuleOrDriver(mod->child);
+    if (mod->sib)
+	UnloadModuleOrDriver(mod->sib);
+    free(mod->path);
+    free(mod->name);
+    free(mod);
+}
+
+void
+UnloadSubModule(pointer _mod)
+{
+    ModuleDescPtr mod = (ModuleDescPtr)_mod;
+
+    if (mod == NULL || mod->name == NULL)
+	return;
+
+    xf86MsgVerb(X_INFO, 3, "UnloadSubModule: \"%s\"\n", mod->name);
+
+    if ((mod->TearDownProc) && (mod->TearDownData))
+	mod->TearDownProc(mod->TearDownData);
+    LoaderUnload(mod->name, mod->handle);
+
+    RemoveChild(mod);
+
+    if (mod->child)
+	UnloadModuleOrDriver(mod->child);
+
+    free(mod->path);
+    free(mod->name);
+    free(mod);
+}
+
+static void
+RemoveChild(ModuleDescPtr child)
+{
+    ModuleDescPtr mdp;
+    ModuleDescPtr prevsib;
+    ModuleDescPtr parent;
+
+    if (!child->parent)
+	return;
+
+    parent = child->parent;
+    if (parent->child == child) {
+	parent->child = child->sib;
+	return;
+    }
+
+    prevsib = parent->child;
+    mdp = prevsib->sib;
+    while (mdp && mdp != child) {
+	prevsib = mdp;
+	mdp = mdp->sib;
+    }
+    if (mdp == child)
+	prevsib->sib = child->sib;
+    return;
+}
+
+void
+LoaderErrorMsg(const char *name, const char *modname, int errmaj, int errmin)
+{
+    const char *msg;
+    MessageType type = X_ERROR;
+
+    switch (errmaj) {
+    case LDR_NOERROR:
+	msg = "no error";
+	break;
+    case LDR_NOMEM:
+	msg = "out of memory";
+	break;
+    case LDR_NOENT:
+	msg = "module does not exist";
+	break;
+    case LDR_NOSUBENT:
+	msg = "a required submodule could not be loaded";
+	break;
+    case LDR_NOSPACE:
+	msg = "too many modules";
+	break;
+    case LDR_NOMODOPEN:
+	msg = "open failed";
+	break;
+    case LDR_UNKTYPE:
+	msg = "unknown module type";
+	break;
+    case LDR_NOLOAD:
+	msg = "loader failed";
+	break;
+    case LDR_ONCEONLY:
+	msg = "already loaded";
+        type = X_INFO;
+	break;
+    case LDR_NOPORTOPEN:
+	msg = "port open failed";
+	break;
+    case LDR_NOHARDWARE:
+	msg = "no hardware found";
+	break;
+    case LDR_MISMATCH:
+	msg = "module requirement mismatch";
+	break;
+    case LDR_BADUSAGE:
+	msg = "invalid argument(s) to LoadModule()";
+	break;
+    case LDR_INVALID:
+	msg = "invalid module";
+	break;
+    case LDR_BADOS:
+	msg = "module doesn't support this OS";
+	break;
+    case LDR_MODSPECIFIC:
+	msg = "module-specific error";
+	break;
+    default:
+	msg = "unknown error";
+    }
+    if (name)
+	xf86Msg(type, "%s: Failed to load module \"%s\" (%s, %d)\n",
+		name, modname, msg, errmin);
+    else
+	xf86Msg(type, "Failed to load module \"%s\" (%s, %d)\n",
+		modname, msg, errmin);
+}
+
+/* Given a module path or file name, return the module's canonical name */
+static char *
+LoaderGetCanonicalName(const char *modname, PatternPtr patterns)
+{
+    char *str;
+    const char *s;
+    int len;
+    PatternPtr p;
+    regmatch_t match[2];
+
+    /* Strip off any leading path */
+    s = strrchr(modname, '/');
+    if (s == NULL)
+	s = modname;
+    else
+	s++;
+
+    /* Find the first regex that is matched */
+    for (p = patterns; p->pattern; p++)
+	if (regexec(&p->rex, s, 2, match, 0) == 0 && match[1].rm_so != -1) {
+	    len = match[1].rm_eo - match[1].rm_so;
+	    str = malloc(len + 1);
+	    if (!str)
+		return NULL;
+	    strncpy(str, s + match[1].rm_so, len);
+	    str[len] = '\0';
+	    return str;
+	}
+
+    /* If there is no match, return the whole name minus the leading path */
+    return strdup(s);
+}
+
+/*
+ * Return the module version information.
+ */
+unsigned long
+LoaderGetModuleVersion(ModuleDescPtr mod)
+{
+    if (!mod || mod == (ModuleDescPtr) 1 || !mod->VersionInfo)
+	return 0;
+
+    return MODULE_VERSION_NUMERIC(mod->VersionInfo->majorversion,
+				  mod->VersionInfo->minorversion,
+				  mod->VersionInfo->patchlevel);
+}