xserver: Branch 'master' - 2 commits

[David Nusinow]

 hw/xfree86/common/xf86AutoConfig.c |   17 +----------------
 hw/xfree86/parser/Screen.c         |   14 +-------------
 hw/xfree86/parser/read.c           |    4 ++--
 3 files changed, 4 insertions(+), 31 deletions(-)

New commits:
diff-tree 28ef7f59416677be380561709197b04df0479bef (from ea2d4dc468dcebe6d38e676469ec51ed1d43490b)
Author: David Nusinow <dnusinow at debian.org>
Date:   Thu Oct 11 20:56:46 2007 -0400

    Re-enable validation of the screen section of xorg.conf
    
    This also fixes a problem where the server can't find the device section
    when it is specified in the screen section.

diff --git a/hw/xfree86/parser/Screen.c b/hw/xfree86/parser/Screen.c
index 4df2b05..4524f17 100644
--- a/hw/xfree86/parser/Screen.c
+++ b/hw/xfree86/parser/Screen.c
@@ -498,12 +498,6 @@ xf86validateScreen (XF86ConfigPtr p)
 	XF86ConfDevicePtr device;
 	XF86ConfAdaptorLinkPtr adaptor;
 
-	if (!screen)
-	{
-		xf86validationError ("At least one Screen section is required.");
-		return (FALSE);
-	}
-
 	while (screen)
 	{
 		if (screen->scrn_obso_driver && !screen->scrn_identifier)
@@ -512,13 +506,7 @@ xf86validateScreen (XF86ConfigPtr p)
 		monitor = xf86findMonitor (screen->scrn_monitor_str, p->conf_monitor_lst);
 		if (screen->scrn_monitor_str)
 		{
-			if (!monitor)
-			{
-				xf86validationError (UNDEFINED_MONITOR_MSG,
-						 	screen->scrn_monitor_str, screen->scrn_identifier);
-				return (FALSE);
-			}
-			else
+			if (monitor)
 			{
 				screen->scrn_monitor = monitor;
 				if (!xf86validateMonitor(p, screen))
diff --git a/hw/xfree86/parser/read.c b/hw/xfree86/parser/read.c
index a272f5c..308ee03 100644
--- a/hw/xfree86/parser/read.c
+++ b/hw/xfree86/parser/read.c
@@ -82,8 +82,8 @@ xf86validateConfig (XF86ConfigPtr p)
 {
 	/*if (!xf86validateDevice (p))
 		return FALSE;*/
-	/*if (!xf86validateScreen (p))
-		return FALSE;*/
+	if (!xf86validateScreen (p))
+		return FALSE;
 	if (!xf86validateInput (p))
 		return FALSE;
 	if (!xf86validateLayout (p))
diff-tree ea2d4dc468dcebe6d38e676469ec51ed1d43490b (from fc092334ac0a323b80a9602cb8bf60ca9dee3bfa)
Author: David Nusinow <dnusinow at debian.org>
Date:   Thu Oct 11 20:26:02 2007 -0400

    When there's no xorg.conf, use the video driver autoloading function

diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c
index bf41c4d..797334e 100644
--- a/hw/xfree86/common/xf86AutoConfig.c
+++ b/hw/xfree86/common/xf86AutoConfig.c
@@ -220,22 +220,7 @@ xf86AutoConfig(void)
     const char *driver = NULL;
     ConfigStatus ret;
 
-    /* Find the primary device, and get some information about it. */
-    iter = pci_slot_match_iterator_create(NULL);
-    while ((info = pci_device_next(iter)) != NULL) {
-	if (xf86IsPrimaryPci(info)) {
-	    break;
-	}
-    }
-
-    pci_iterator_destroy(iter);
-
-    if (!info) {
-	ErrorF("Primary device is not PCI\n");
-    }
-
-    if (info)
-	driver = videoPtrToDriverName(info);
+    driver = chooseVideoDriver();
 
     AppendToConfig(BUILTIN_MODULE_SECTION);
     AppendToConfig(BUILTIN_MONITOR_SECTION);