# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
# Use subject to license terms.
#
# 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, 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 Software 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
# MERCHANTABILITY, 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 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.
# 
# 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.

diff -urp -x '*~' -x '*.orig' hw/xfree86/common/xf86Config.c hw/xfree86/common/xf86Config.c
--- hw/xfree86/common/xf86Config.c	2008-09-24 20:22:56.371591000 -0700
+++ hw/xfree86/common/xf86Config.c	2008-09-24 20:23:15.204372000 -0700
@@ -563,11 +563,30 @@ fixup_video_driver_list(char **drivers)
                 if (!strcmp(*drv, "ati")) {
                     ati = drv;
                     x = *ati; *ati = *atimisc; *atimisc = x;
-                    return;
+		    break;
                 }
             }
             /* if we get here, ati was already ahead of atimisc */
-            return;
+	    break;
+        }
+    }
+    /*
+     * Since the nvidia kernel driver interferes with the nv Xorg driver,
+     * make sure to prefer nvidia if it's installed
+     */
+    for (drv = drivers; drv != end; drv++) {
+	char **nv, **nvidia;
+        if (!strcmp(*drv, "nv")) {
+            nv = drv;
+            for (drv = nv; drv != end; drv++) {
+                if (!strcmp(*drv, "nvidia")) {
+                    nvidia = drv;
+                    x = *nvidia; *nvidia = *nv; *nv = x;
+		    break;
+                }
+            }
+            /* if we get here, nvidia was already ahead of nv */
+            break;
         }
     }
 }