nvidia-autoconfig.patch revision 98
98N/A# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
98N/A# Use subject to license terms.
98N/A#
98N/A# Permission is hereby granted, free of charge, to any person obtaining a
98N/A# copy of this software and associated documentation files (the
98N/A# "Software"), to deal in the Software without restriction, including
98N/A# without limitation the rights to use, copy, modify, merge, publish,
98N/A# distribute, and/or sell copies of the Software, and to permit persons
98N/A# to whom the Software is furnished to do so, provided that the above
98N/A# copyright notice(s) and this permission notice appear in all copies of
98N/A# the Software and that both the above copyright notice(s) and this
98N/A# permission notice appear in supporting documentation.
98N/A#
98N/A# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
98N/A# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
98N/A# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
98N/A# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
98N/A# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
98N/A# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
98N/A# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
98N/A# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
98N/A# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
98N/A#
98N/A# Except as contained in this notice, the name of a copyright holder
98N/A# shall not be used in advertising or otherwise to promote the sale, use
98N/A# or other dealings in this Software without prior written authorization
98N/A# of the copyright holder.
98N/A
98N/A--- hw/xfree86/common/xf86AutoConfig.c 2006-12-06 22:08:26.575466000 -0800
98N/A+++ hw/xfree86/common/xf86AutoConfig.c 2006-12-07 15:19:47.671859000 -0800
98N/A@@ -40,6 +40,10 @@
98N/A #include "xf86Priv.h"
98N/A #include "xf86_OSlib.h"
98N/A
98N/A+#if defined(sun) && !defined(__sparc)
98N/A+# include <sys/visual_io.h>
98N/A+#endif
98N/A+
98N/A /* Sections for the default built-in configuration. */
98N/A
98N/A #define BUILTIN_MODULE_SECTION \
98N/A@@ -242,6 +246,22 @@
98N/A if (info)
98N/A driver = videoPtrToDriverName(info);
98N/A
98N/A+#if defined(sun) && !defined(__sparc)
98N/A+ /* Check for nvidia accelerated driver - needs to be replaced with
98N/A+ * more general mechanism for selecting drivers based on fbtype
98N/A+ */
98N/A+ if (xf86Info.consoleFd >= 0) {
98N/A+ struct vis_identifier visid;
98N/A+
98N/A+ if (ioctl(xf86Info.consoleFd, VIS_GETIDENTIFIER, &visid) >= 0) {
98N/A+ xf86Msg(X_PROBED, "console driver: %s\n", visid.name);
98N/A+ if (strcmp(visid.name, "NVDAnvda") == 0) {
98N/A+ driver = "nvidia";
98N/A+ }
98N/A+ }
98N/A+ }
98N/A+#endif
98N/A+
98N/A AppendToConfig(BUILTIN_MODULE_SECTION);
98N/A AppendToConfig(BUILTIN_MONITOR_SECTION);
98N/A
98N/A
98N/A--- hw/xfree86/common/xf86Config.c 2006-12-06 22:08:26.479334000 -0800
98N/A+++ hw/xfree86/common/xf86Config.c 2006-12-07 15:31:59.400139000 -0800
98N/A@@ -513,11 +513,30 @@
98N/A if (!strcmp(*drv, "ati")) {
98N/A ati = drv;
98N/A x = *ati; *ati = *atimisc; *atimisc = x;
98N/A- return;
98N/A+ break;
98N/A }
98N/A }
98N/A /* if we get here, ati was already ahead of atimisc */
98N/A- return;
98N/A+ break;
98N/A+ }
98N/A+ }
98N/A+ /*
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+ */
98N/A+ for (drv = drivers; drv != end; drv++) {
98N/A+ char **nv, **nvidia;
98N/A+ if (!strcmp(*drv, "nv")) {
98N/A+ nv = drv;
98N/A+ for (drv = nv; drv != end; drv++) {
98N/A+ if (!strcmp(*drv, "nvidia")) {
98N/A+ nvidia = drv;
98N/A+ x = *nvidia; *nvidia = *nv; *nv = x;
98N/A+ break;
98N/A+ }
98N/A+ }
98N/A+ /* if we get here, nvidia was already ahead of nv */
98N/A+ break;
98N/A }
98N/A }
98N/A }