components/x11/xorg-server/patches/15-6721634.patch

   1 # Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
   2 #
   3 # Permission is hereby granted, free of charge, to any person obtaining a
   4 # copy of this software and associated documentation files (the "Software"),
   5 # to deal in the Software without restriction, including without limitation
   6 # the rights to use, copy, modify, merge, publish, distribute, sublicense,
   7 # and/or sell copies of the Software, and to permit persons to whom the
   8 # Software is furnished to do so, subject to the following conditions:
   9 #
  10 # The above copyright notice and this permission notice (including the next
  11 # paragraph) shall be included in all copies or substantial portions of the
  12 # Software.
  13 #
  14 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  15 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  16 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
  17 # THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  18 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  19 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  20 # DEALINGS IN THE SOFTWARE.
  21 diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c
  22 index 95d58fe..0b5f724 100644
  23 --- a/hw/xfree86/common/xf86AutoConfig.c
  24 +++ b/hw/xfree86/common/xf86AutoConfig.c
  25 @@ -60,6 +60,18 @@
  26         "\tIdentifier\t" BUILTIN_DEVICE_NAME "\n" \
  27         "\tDriver\t\"%s\"\n"
  28
  29 +#ifdef sun
  30 +/*
  31 + * Allow setting an arbitrary number of options.
  32 + * Each option should be indented with a tab and newline terminated.
  33 + */
  34 +#define BUILTIN_DEVICE_SECTION_PRE_OPT \
  35 +       "Section \"Device\"\n" \
  36 +       "\tIdentifier\t" BUILTIN_DEVICE_NAME "\n" \
  37 +       "\tDriver\t\"%s\"\n" \
  38 +       "%s"
  39 +#endif
  40 +
  41  #define BUILTIN_DEVICE_SECTION_POST \
  42         "EndSection\n\n"
  43
  44 @@ -67,6 +79,13 @@
  45         BUILTIN_DEVICE_SECTION_PRE \
  46         BUILTIN_DEVICE_SECTION_POST
  47
  48 +#ifdef sun
  49 +/* Device section with options */
  50 +#define BUILTIN_DEVICE_SECTION_OPT \
  51 +       BUILTIN_DEVICE_SECTION_PRE_OPT \
  52 +       BUILTIN_DEVICE_SECTION_POST
  53 +#endif
  54 +
  55  #define BUILTIN_SCREEN_NAME \
  56         "\"Builtin Default %s Screen %d\""
  57
  58 @@ -152,6 +171,14 @@ xf86AutoConfig(void)
  59      listPossibleVideoDrivers(deviceList, 20);
  60
  61      for (p = deviceList; *p; p++) {
  62 +#ifdef sun
  63 +        const char *nvidia_string = "nvidia";
  64 +        const char *nvidia_opt_no_logo = "\tOption \"NoLogo\" \"True\"\n";
  65 +        if (!strncmp(*p, nvidia_string, sizeof(nvidia_string)))
  66 +            snprintf(buf, sizeof(buf), BUILTIN_DEVICE_SECTION_OPT,
  67 +                     *p, 0, *p, nvidia_opt_no_logo);
  68 +        else
  69 +#endif
  70          snprintf(buf, sizeof(buf), BUILTIN_DEVICE_SECTION, *p, 0, *p);
  71          AppendToConfig(buf);
  72          snprintf(buf, sizeof(buf), BUILTIN_SCREEN_SECTION, *p, 0, *p, 0);