# Copyright 2009 Sun Microsystems, Inc. All rights reserved.

# Use is 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/xf86AutoConfig.c hw/xfree86/common/xf86AutoConfig.c

--- hw/xfree86/common/xf86AutoConfig.c 2009-10-08 21:08:28.000000000 -0700

+++ hw/xfree86/common/xf86AutoConfig.c 2009-11-03 22:29:14.137406985 -0800

@@ -59,6 +59,18 @@

"\tIdentifier\t" BUILTIN_DEVICE_NAME "\n" \

"\tDriver\t\"%s\"\n"

+#ifdef sun

+/*

+ * Allow setting an arbitrary number of options.

+ * Each option should be indented with a tab and newline terminated.

+ */

+#define BUILTIN_DEVICE_SECTION_PRE_OPT \

+ "Section \"Device\"\n" \

+ "\tIdentifier\t" BUILTIN_DEVICE_NAME "\n" \

+ "\tDriver\t\"%s\"\n" \

+ "%s"

+#endif

+

#define BUILTIN_DEVICE_SECTION_POST \

"EndSection\n\n"

@@ -66,6 +78,13 @@

BUILTIN_DEVICE_SECTION_PRE \

BUILTIN_DEVICE_SECTION_POST

+#ifdef sun

+/* Device section with options */

+#define BUILTIN_DEVICE_SECTION_OPT \

+ BUILTIN_DEVICE_SECTION_PRE_OPT \

+ BUILTIN_DEVICE_SECTION_POST

+#endif

+

#define BUILTIN_SCREEN_NAME \

"\"Builtin Default %s Screen %d\""

@@ -247,6 +266,14 @@ xf86AutoConfig(void)

listPossibleVideoDrivers(deviceList, 20);

for (p = deviceList; *p; p++) {

+#ifdef sun

+ const char *nvidia_string = "nvidia";

+ const char *nvidia_opt_no_logo = "\tOption \"NoLogo\" \"True\"\n";

+ if (!strncmp(*p, nvidia_string, sizeof(nvidia_string)))

+ snprintf(buf, sizeof(buf), BUILTIN_DEVICE_SECTION_OPT,

+ *p, 0, *p, nvidia_opt_no_logo);

+ else

+#endif

snprintf(buf, sizeof(buf), BUILTIN_DEVICE_SECTION, *p, 0, *p);

AppendToConfig(buf);

snprintf(buf, sizeof(buf), BUILTIN_SCREEN_SECTION, *p, 0, *p, 0);