851N/A# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
851N/A# Use is subject to license terms.
98N/A# Permission is hereby granted, free of charge, to any person obtaining a
919N/A# copy of this software and associated documentation files (the "Software"),
919N/A# to deal in the Software without restriction, including without limitation
919N/A# the rights to use, copy, modify, merge, publish, distribute, sublicense,
919N/A#
and/or sell copies of the Software, and to permit persons to whom the
919N/A# Software is furnished to do so, subject to the following conditions:
919N/A# The above copyright notice and this permission notice (including the next
919N/A# paragraph) shall be included in all copies or substantial portions of the
919N/A# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
919N/A# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
919N/A# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
919N/A# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
919N/A# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
919N/A# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
919N/A# DEALINGS IN THE SOFTWARE.
851N/A@@ -534,11 +534,30 @@ fixup_video_driver_list(char **drivers)
98N/A if (!strcmp(*drv, "ati")) {
98N/A x = *ati; *ati = *atimisc; *atimisc = x;
98N/A /* if we get here, ati was already ahead of atimisc */
98N/A+ * Since the nvidia kernel driver interferes with the nv Xorg driver,
98N/A+ * make sure to prefer nvidia if it's installed
98N/A+ for (drv = drivers; drv != end; drv++) {
98N/A+ char **nv, **nvidia;
98N/A+ if (!strcmp(*drv, "nv")) {
98N/A+ for (drv = nv; drv != end; drv++) {
98N/A+ if (!strcmp(*drv, "nvidia")) {
98N/A+ x = *nvidia; *nvidia = *nv; *nv = x;
98N/A+ /* if we get here, nvidia was already ahead of nv */