Mercurial Mercurial > upstream > oracle > xnv / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
open-src/xserver/xorg/6721634.patch
author Alan Coopersmith <Alan.Coopersmith@Sun.COM>
Tue, 02 Mar 2010 13:31:46 -0800
changeset 919 425233ae7236
parent 851 d428083dbbdd
child 943 294f64612d23
permissions -rw-r--r--
6931307 Standardize Sun copyright & license notices in X gate on current format
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
851
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 705
diff changeset 
     1
 
# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 705
diff changeset 
     2
 
# Use is subject to license terms.
517
933104ebefbd 6721634 The Nvidia logo screen should *not* be displayed
John Martin <John.M.Martin@Sun.COM>
parents:
diff changeset 
     3
 
#
933104ebefbd 6721634 The Nvidia logo screen should *not* be displayed
John Martin <John.M.Martin@Sun.COM>
parents:
diff changeset 
     4
 
# Permission is hereby granted, free of charge, to any person obtaining a
919
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 851
diff changeset 
     5
 
# copy of this software and associated documentation files (the "Software"),
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 851
diff changeset 
     6
 
# to deal in the Software without restriction, including without limitation
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 851
diff changeset 
     7
 
# the rights to use, copy, modify, merge, publish, distribute, sublicense,
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 851
diff changeset 
     8
 
# and/or sell copies of the Software, and to permit persons to whom the
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 851
diff changeset 
     9
 
# Software is furnished to do so, subject to the following conditions:
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 851
diff changeset 
    10
 
#
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 851
diff changeset 
    11
 
# The above copyright notice and this permission notice (including the next
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 851
diff changeset 
    12
 
# paragraph) shall be included in all copies or substantial portions of the
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 851
diff changeset 
    13
 
# Software.
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 851
diff changeset 
    14
 
#
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 851
diff changeset 
    15
 
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 851
diff changeset 
    16
 
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 851
diff changeset 
    17
 
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 851
diff changeset 
    18
 
# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 851
diff changeset 
    19
 
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 851
diff changeset 
    20
 
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 851
diff changeset 
    21
 
# DEALINGS IN THE SOFTWARE.
517
933104ebefbd 6721634 The Nvidia logo screen should *not* be displayed
John Martin <John.M.Martin@Sun.COM>
parents:
diff changeset 
    22
 
diff -urp -x '*~' -x '*.orig' hw/xfree86/common/xf86AutoConfig.c hw/xfree86/common/xf86AutoConfig.c
851
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 705
diff changeset 
    23
 
--- hw/xfree86/common/xf86AutoConfig.c	2009-10-08 21:08:28.000000000 -0700
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 705
diff changeset 
    24
 
+++ hw/xfree86/common/xf86AutoConfig.c	2009-11-03 22:29:14.137406985 -0800
705
24ca414edbff 6826940 Xorg server 1.6.1, Mesa 7.4.1, and associated module upgrades [PSARC 2009/292]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 606
diff changeset 
    25
 
@@ -59,6 +59,18 @@
517
933104ebefbd 6721634 The Nvidia logo screen should *not* be displayed
John Martin <John.M.Martin@Sun.COM>
parents:
diff changeset 
    26
 
 	"\tIdentifier\t" BUILTIN_DEVICE_NAME "\n" \
933104ebefbd 6721634 The Nvidia logo screen should *not* be displayed
John Martin <John.M.Martin@Sun.COM>
parents:
diff changeset 
    27
 
 	"\tDriver\t\"%s\"\n"
933104ebefbd 6721634 The Nvidia logo screen should *not* be displayed
John Martin <John.M.Martin@Sun.COM>
parents:
diff changeset 
    28
933104ebefbd 6721634 The Nvidia logo screen should *not* be displayed
John Martin <John.M.Martin@Sun.COM>
parents:
diff changeset 
    29
 
+#ifdef sun
933104ebefbd 6721634 The Nvidia logo screen should *not* be displayed
John Martin <John.M.Martin@Sun.COM>
parents:
diff changeset 
    30
 
+/*
933104ebefbd 6721634 The Nvidia logo screen should *not* be displayed
John Martin <John.M.Martin@Sun.COM>
parents:
diff changeset 
    31
 
+ * Allow setting an arbitrary number of options.
933104ebefbd 6721634 The Nvidia logo screen should *not* be displayed
John Martin <John.M.Martin@Sun.COM>
parents:
diff changeset 
    32
 
+ * Each option should be indented with a tab and newline terminated.
933104ebefbd 6721634 The Nvidia logo screen should *not* be displayed
John Martin <John.M.Martin@Sun.COM>
parents:
diff changeset 
    33
 
+ */
933104ebefbd 6721634 The Nvidia logo screen should *not* be displayed
John Martin <John.M.Martin@Sun.COM>
parents:
diff changeset 
    34
 
+#define BUILTIN_DEVICE_SECTION_PRE_OPT \
933104ebefbd 6721634 The Nvidia logo screen should *not* be displayed
John Martin <John.M.Martin@Sun.COM>
parents:
diff changeset 
    35
 
+	"Section \"Device\"\n" \
933104ebefbd 6721634 The Nvidia logo screen should *not* be displayed
John Martin <John.M.Martin@Sun.COM>
parents:
diff changeset 
    36
 
+	"\tIdentifier\t" BUILTIN_DEVICE_NAME "\n" \
933104ebefbd 6721634 The Nvidia logo screen should *not* be displayed
John Martin <John.M.Martin@Sun.COM>
parents:
diff changeset 
    37
 
+	"\tDriver\t\"%s\"\n" \
933104ebefbd 6721634 The Nvidia logo screen should *not* be displayed
John Martin <John.M.Martin@Sun.COM>
parents:
diff changeset 
    38
 
+	"%s"
933104ebefbd 6721634 The Nvidia logo screen should *not* be displayed
John Martin <John.M.Martin@Sun.COM>
parents:
diff changeset 
    39
 
+#endif
933104ebefbd 6721634 The Nvidia logo screen should *not* be displayed
John Martin <John.M.Martin@Sun.COM>
parents:
diff changeset 
    40
 
+
933104ebefbd 6721634 The Nvidia logo screen should *not* be displayed
John Martin <John.M.Martin@Sun.COM>
parents:
diff changeset 
    41
 
 #define BUILTIN_DEVICE_SECTION_POST \
933104ebefbd 6721634 The Nvidia logo screen should *not* be displayed
John Martin <John.M.Martin@Sun.COM>
parents:
diff changeset 
    42
 
 	"EndSection\n\n"
933104ebefbd 6721634 The Nvidia logo screen should *not* be displayed
John Martin <John.M.Martin@Sun.COM>
parents:
diff changeset 
    43
705
24ca414edbff 6826940 Xorg server 1.6.1, Mesa 7.4.1, and associated module upgrades [PSARC 2009/292]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 606
diff changeset 
    44
 
@@ -66,6 +78,13 @@
517
933104ebefbd 6721634 The Nvidia logo screen should *not* be displayed
John Martin <John.M.Martin@Sun.COM>
parents:
diff changeset 
    45
 
 	BUILTIN_DEVICE_SECTION_PRE \
933104ebefbd 6721634 The Nvidia logo screen should *not* be displayed
John Martin <John.M.Martin@Sun.COM>
parents:
diff changeset 
    46
 
 	BUILTIN_DEVICE_SECTION_POST
933104ebefbd 6721634 The Nvidia logo screen should *not* be displayed
John Martin <John.M.Martin@Sun.COM>
parents:
diff changeset 
    47
933104ebefbd 6721634 The Nvidia logo screen should *not* be displayed
John Martin <John.M.Martin@Sun.COM>
parents:
diff changeset 
    48
 
+#ifdef sun
933104ebefbd 6721634 The Nvidia logo screen should *not* be displayed
John Martin <John.M.Martin@Sun.COM>
parents:
diff changeset 
    49
 
+/* Device section with options */
933104ebefbd 6721634 The Nvidia logo screen should *not* be displayed
John Martin <John.M.Martin@Sun.COM>
parents:
diff changeset 
    50
 
+#define BUILTIN_DEVICE_SECTION_OPT \
933104ebefbd 6721634 The Nvidia logo screen should *not* be displayed
John Martin <John.M.Martin@Sun.COM>
parents:
diff changeset 
    51
 
+	BUILTIN_DEVICE_SECTION_PRE_OPT \
933104ebefbd 6721634 The Nvidia logo screen should *not* be displayed
John Martin <John.M.Martin@Sun.COM>
parents:
diff changeset 
    52
 
+	BUILTIN_DEVICE_SECTION_POST
933104ebefbd 6721634 The Nvidia logo screen should *not* be displayed
John Martin <John.M.Martin@Sun.COM>
parents:
diff changeset 
    53
 
+#endif
933104ebefbd 6721634 The Nvidia logo screen should *not* be displayed
John Martin <John.M.Martin@Sun.COM>
parents:
diff changeset 
    54
 
+
606
068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 517
diff changeset 
    55
 
 #define BUILTIN_SCREEN_NAME \
068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 517
diff changeset 
    56
 
 	"\"Builtin Default %s Screen %d\""
517
933104ebefbd 6721634 The Nvidia logo screen should *not* be displayed
John Martin <John.M.Martin@Sun.COM>
parents:
diff changeset 
    57
851
d428083dbbdd 6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 705
diff changeset 
    58
 
@@ -247,6 +266,14 @@ xf86AutoConfig(void)
606
068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 517
diff changeset 
    59
 
     listPossibleVideoDrivers(deviceList, 20);
517
933104ebefbd 6721634 The Nvidia logo screen should *not* be displayed
John Martin <John.M.Martin@Sun.COM>
parents:
diff changeset 
    60
606
068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 517
diff changeset 
    61
 
     for (p = deviceList; *p; p++) {
517
933104ebefbd 6721634 The Nvidia logo screen should *not* be displayed
John Martin <John.M.Martin@Sun.COM>
parents:
diff changeset 
    62
 
+#ifdef sun
606
068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 517
diff changeset 
    63
 
+	const char *nvidia_string = "nvidia";
068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 517
diff changeset 
    64
 
+	const char *nvidia_opt_no_logo = "\tOption \"NoLogo\" \"True\"\n";
068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 517
diff changeset 
    65
 
+	if (!strncmp(*p, nvidia_string, sizeof(nvidia_string)))
068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 517
diff changeset 
    66
 
+	    snprintf(buf, sizeof(buf), BUILTIN_DEVICE_SECTION_OPT,
068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 517
diff changeset 
    67
 
+		     *p, 0, *p, nvidia_opt_no_logo);
068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 517
diff changeset 
    68
 
+	else
517
933104ebefbd 6721634 The Nvidia logo screen should *not* be displayed
John Martin <John.M.Martin@Sun.COM>
parents:
diff changeset 
    69
 
+#endif
606
068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 517
diff changeset 
    70
 
 	snprintf(buf, sizeof(buf), BUILTIN_DEVICE_SECTION, *p, 0, *p);
068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 517
diff changeset 
    71
 
 	AppendToConfig(buf);
068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 517
diff changeset 
    72
 
 	snprintf(buf, sizeof(buf), BUILTIN_SCREEN_SECTION, *p, 0, *p, 0);
upstream/oracle/xnv