310.14310.14

8 files changed, 20 insertions, 104 deletions

diff --git a/common-utils/common-utils.h b/common-utils/common-utils.h
index c5cd411..626fd1b 100644
--- a/common-utils/common-utils.h
+++ b/common-utils/common-utils.h
@@ -33,6 +33,13 @@
 #define TAB "  "
 #define BIGTAB "      "
 
+#define VERBOSITY_NONE     0 /* nothing */
+#define VERBOSITY_ERROR    1 /* errors only */
+#define VERBOSITY_WARNING  2 /* errors and warnings */
+#define VERBOSITY_ALL      3 /* errors, warnings and other info */
+
+#define VERBOSITY_DEFAULT  VERBOSITY_ERROR
+
 typedef struct {
     char **t; /* the text rows */
     int n;    /* number of rows */
diff --git a/nvidia-cfg.h b/nvidia-cfg.h
index ac97c18..310be82 100644
--- a/nvidia-cfg.h
+++ b/nvidia-cfg.h
@@ -69,8 +69,7 @@ typedef struct {
  */
 
 typedef enum {
-    NVCFG_TYPE_GSYNC1 = 0,
-    NVCFG_TYPE_GSYNC2,
+    NVCFG_TYPE_GSYNC2 = 1,
     NVCFG_TYPE_GSYNC3
 } NvCfgGSyncDeviceType;
 
diff --git a/nvidia-xconfig.c b/nvidia-xconfig.c
index 7cda22a..b9ff311 100644
--- a/nvidia-xconfig.c
+++ b/nvidia-xconfig.c
@@ -229,31 +229,6 @@ static void parse_commandline(Options *op, int argc, char *argv[])
                 break;
             }
 
-        case NVAGP_OPTION:
-
-            /* mark as disabled, so we can remove the option later */
-            
-            if (disable) {
-                op->nvagp = -2;
-                break;
-            }
-
-            if      (strcasecmp(strval, "none")    == 0) op->nvagp = 0;
-            else if (strcasecmp(strval, "nvagp")   == 0) op->nvagp = 1;
-            else if (strcasecmp(strval, "agpgart") == 0) op->nvagp = 2;
-            else if (strcasecmp(strval, "any")     == 0) op->nvagp = 3;
-            else if ((strval[0] == '0') && (strval[1] == '\0')) op->nvagp = 0;
-            else if ((strval[0] == '1') && (strval[1] == '\0')) op->nvagp = 1;
-            else if ((strval[0] == '2') && (strval[1] == '\0')) op->nvagp = 2;
-            else if ((strval[0] == '3') && (strval[1] == '\0')) op->nvagp = 3;
-            else {
-                fprintf(stderr, "\n");
-                fprintf(stderr, "Invalid nvagp: %s.\n", strval);
-                fprintf(stderr, "\n");
-                goto fail;
-            }
-            break;
-
         case TRANSPARENT_INDEX_OPTION:
 
             /* mark as disabled, so we can remove the option later */
@@ -338,23 +313,6 @@ static void parse_commandline(Options *op, int argc, char *argv[])
             }
             break;
 
-        case TV_OVER_SCAN_OPTION:
-            
-            /* mark as disabled, so we can remove the option later */
-
-            if (disable) {
-                op->tv_over_scan = -2.0;
-                break;
-            }
-
-            if (doubleval >= 0.0 && doubleval <= 1.0) {
-                op->tv_over_scan = doubleval;
-            } else {
-                fprintf(stderr, "Invalid TVOverScan value: %f.\n", doubleval);
-                goto fail;
-            }
-            break;
-
         case COOL_BITS_OPTION:
 
             /* mark as disabled, so we can remove the option later */
@@ -376,7 +334,7 @@ static void parse_commandline(Options *op, int argc, char *argv[])
                 break;
             }
 
-            if (intval < 0 || intval > 11) {
+            if (intval < 0 || intval > 12) {
                 fprintf(stderr, "\n");
                 fprintf(stderr, "Invalid stereo: %d.\n", intval);
                 fprintf(stderr, "\n");
@@ -718,7 +676,6 @@ static Options *load_default_options(void)
     op = (Options *) nvalloc(sizeof(Options));
     if (!op) return NULL;
     
-    op->nvagp = -1;
     op->transparent_index = -1;
     op->stereo = -1;
     op->cool_bits = -1;
diff --git a/nvidia-xconfig.h b/nvidia-xconfig.h
index 65168de..af142c6 100644
--- a/nvidia-xconfig.h
+++ b/nvidia-xconfig.h
@@ -38,7 +38,6 @@
 #define OVERLAY_BOOL_OPTION                     4
 #define CIOVERLAY_BOOL_OPTION                   5
 #define OVERLAY_DEFAULT_VISUAL_BOOL_OPTION      6
-#define NO_BANDWIDTH_TEST_BOOL_OPTION           7
 #define NO_POWER_CONNECTOR_CHECK_BOOL_OPTION    8
 #define ALLOW_GLX_WITH_COMPOSITE_BOOL_OPTION    10
 #define RANDR_ROTATION_BOOL_OPTION              11
@@ -49,10 +48,8 @@
 #define DAC_8BIT_BOOL_OPTION                    17
 #define USE_EDID_FREQS_BOOL_OPTION              18
 #define USE_EDID_BOOL_OPTION                    19
-#define USE_INT10_MODULE_BOOL_OPTION            20
 #define FORCE_STEREO_FLIPPING_BOOL_OPTION       21
 #define MULTISAMPLE_COMPATIBILITY_BOOL_OPTION   22
-#define XVMC_USES_TEXTURES_BOOL_OPTION          23
 #define EXACT_MODE_TIMINGS_DVI_BOOL_OPTION      24
 #define ADD_ARGB_GLX_VISUALS_BOOL_OPTION        27
 #define COMPOSITE_BOOL_OPTION                   28
@@ -120,7 +117,6 @@ typedef struct __options {
     u32 boolean_option_values[XCONFIG_BOOL_OPTION_SLOTS];
 
     int depth;
-    int nvagp;
     int transparent_index;
     int stereo;
     int cool_bits;
diff --git a/option_table.h b/option_table.h
index 5ddfaeb..878a4fa 100644
--- a/option_table.h
+++ b/option_table.h
@@ -26,7 +26,6 @@ enum {
     MODE_LIST_OPTION,
     REMOVE_MODE_OPTION,
     NVIDIA_CFG_PATH_OPTION,
-    NVAGP_OPTION,
     SLI_OPTION,
     DISABLE_SCF_OPTION,
     TRANSPARENT_INDEX_OPTION,
@@ -149,10 +148,6 @@ static const NVGetoptOption __options[] = {
       "Enable or disable the \"AllowGLXWithComposite\" X configuration "
       "option." },
 
-    { "bandwidth-test", XCONFIG_BOOL_VAL(NO_BANDWIDTH_TEST_BOOL_OPTION),
-      NVGETOPT_IS_BOOLEAN, NULL,
-      "Disable or enable the \"NoBandWidthTest\" X configuration option." },
-
     { "busid", BUSID_OPTION,
       NVGETOPT_STRING_ARGUMENT | NVGETOPT_ALLOW_DISABLE, NULL,
       "This option writes the specified BusID to the device section of the "
@@ -412,13 +407,6 @@ static const NVGetoptOption __options[] = {
       "Enable or disable the use of separate front and "
       "back multisample buffers." },
 
-    { "nvagp", NVAGP_OPTION,
-      NVGETOPT_STRING_ARGUMENT | NVGETOPT_ALLOW_DISABLE, NULL,
-      "Set the NvAGP X config option value.  Possible values are 0 (no AGP), "
-      "1 (NVIDIA's AGP), 2 (AGPGART), 3 (try AGPGART, then try NVIDIA's AGP); "
-      "these values can also be specified as 'none', 'nvagp', 'agpgart', or "
-      "'any'." },
-
     { "nvidia-cfg-path",
       NVIDIA_CFG_PATH_OPTION, NVGETOPT_STRING_ARGUMENT, "PATH",
       "The nvidia-cfg library is used to communicate with the NVIDIA kernel "
@@ -525,7 +513,7 @@ static const NVGetoptOption __options[] = {
       "4 (multi-display clone mode stereo), 5 (SeeReal digital flat panel), 6 "
       "(Sharp3D digital flat panel), 7 (Arisawa/Hyundai/Zalman/Pavione/Miracube), "
       "8 (3D DLP), 9 (3D DLP INV), 10 (NVIDIA 3D VISION), "
-      "11 (NVIDIA 3D VISION PRO)." },
+      "11 (NVIDIA 3D VISION PRO), 12 (HDMI 3D)." },
 
     { "thermal-configuration-check",
       XCONFIG_BOOL_VAL(THERMAL_CONFIGURATION_CHECK_BOOL_OPTION),
@@ -546,11 +534,6 @@ static const NVGetoptOption __options[] = {
       "Enable or disable the \"TVOutFormat\" X configuration option. Valid "
       "values for \"TVOutFormat\" are: \"SVIDEO\" and \"COMPOSITE\"." },
 
-    { "tv-over-scan", TV_OVER_SCAN_OPTION,
-      NVGETOPT_DOUBLE_ARGUMENT | NVGETOPT_ALLOW_DISABLE, NULL,
-      "Enable or disable the \"TVOverScan\" X configuration option. Valid "
-      "values are decimal values in the range 1.0 and 0.0." },
-
     { "metamode-orientation", METAMODE_ORIENTATION_OPTION,
       NVGETOPT_STRING_ARGUMENT | NVGETOPT_ALLOW_DISABLE, "ORIENTATION",
       "Specify the MetaModeOrientation.  Valid values for &ORIENTATION& are: "
@@ -602,12 +585,6 @@ static const NVGetoptOption __options[] = {
       "NVIDIA X driver will use frequency information from the EDID, when "
       "available)." },
 
-    { "use-int10-module",
-      XCONFIG_BOOL_VAL(USE_INT10_MODULE_BOOL_OPTION),
-      NVGETOPT_IS_BOOLEAN, NULL,
-      "Enable use of the X Int10 module to soft-boot all secondary cards, "
-      "rather than POSTing the cards through the NVIDIA kernel module." },
-
     { "use-display-device", USE_DISPLAY_DEVICE_OPTION,
       NVGETOPT_STRING_ARGUMENT | NVGETOPT_ALLOW_DISABLE, "DISPLAY-DEVICE",
       "Force the X driver to use the display device specified." },
@@ -631,12 +608,6 @@ static const NVGetoptOption __options[] = {
     { "xinerama", XCONFIG_BOOL_VAL(XINERAMA_BOOL_OPTION),
       NVGETOPT_IS_BOOLEAN, NULL, "Enable or disable Xinerama." },
 
-    { "xvmc-uses-textures",
-      XCONFIG_BOOL_VAL(XVMC_USES_TEXTURES_BOOL_OPTION),
-      NVGETOPT_IS_BOOLEAN, NULL,
-      "Forces XvMC to use the 3D engine for XvMCPutSurface requests rather "
-      "than the video overlay." },
-
     { "color-space", COLOR_SPACE_OPTION,
       NVGETOPT_STRING_ARGUMENT | NVGETOPT_ALLOW_DISABLE, "COLORSPACE",
       "Enable or disable the \"ColorSpace\" X configuration option. "
diff --git a/options.c b/options.c
index 289a23b..3060166 100644
--- a/options.c
+++ b/options.c
@@ -43,7 +43,6 @@ static const NvidiaXConfigOption __options[] = {
     { OVERLAY_BOOL_OPTION,                   FALSE, "Overlay" },
     { CIOVERLAY_BOOL_OPTION,                 FALSE, "CIOverlay" },
     { OVERLAY_DEFAULT_VISUAL_BOOL_OPTION,    FALSE, "OverlayDefaultVisual" },
-    { NO_BANDWIDTH_TEST_BOOL_OPTION,         TRUE,  "NoBandWidthTest" },
     { NO_POWER_CONNECTOR_CHECK_BOOL_OPTION,  TRUE,  "NoPowerConnectorCheck" },
     { THERMAL_CONFIGURATION_CHECK_BOOL_OPTION, FALSE, "ThermalConfigurationCheck" },
     { ALLOW_GLX_WITH_COMPOSITE_BOOL_OPTION,  FALSE, "AllowGLXWithComposite" },
@@ -54,10 +53,8 @@ static const NvidiaXConfigOption __options[] = {
     { DAC_8BIT_BOOL_OPTION,                  FALSE, "Dac8Bit" },
     { USE_EDID_FREQS_BOOL_OPTION,            FALSE, "UseEdidFreqs" },
     { USE_EDID_BOOL_OPTION,                  FALSE, "UseEdid" },
-    { USE_INT10_MODULE_BOOL_OPTION,          FALSE, "UseInt10Module" },
     { FORCE_STEREO_FLIPPING_BOOL_OPTION,     FALSE, "ForceStereoFlipping" },
     { MULTISAMPLE_COMPATIBILITY_BOOL_OPTION, FALSE, "MultisampleCompatibility" },
-    { XVMC_USES_TEXTURES_BOOL_OPTION,        FALSE, "XvmcUsesTextures" },
     { EXACT_MODE_TIMINGS_DVI_BOOL_OPTION,    FALSE, "ExactModeTimingsDVI" },
     { ADD_ARGB_GLX_VISUALS_BOOL_OPTION,      FALSE, "AddARGBGLXVisuals" },
     { DISABLE_GLX_ROOT_CLIPPING_BOOL_OPTION, FALSE, "DisableGLXRootClipping" },
@@ -545,16 +542,6 @@ void update_options(Options *op, XConfigScreenPtr screen)
     
     update_display_options(op, screen);
 
-    /* add the nvagp option */
-    
-    if (op->nvagp != -1) {
-        remove_option(screen, "nvagp");
-        if (op->nvagp != -2) {
-            snprintf(scratch, 8, "%d", op->nvagp);
-            set_option_value(screen, "NvAGP", scratch);
-        }
-    }
-
     /* add the transparent index option */
     
     if (op->transparent_index != -1) {
@@ -700,16 +687,6 @@ void update_options(Options *op, XConfigScreenPtr screen)
         }
     }
 
-    /* add the TVOverScan option */
-
-    if (op->tv_over_scan != -1.0) {
-        remove_option(screen, "TVOverScan");
-        if (op->tv_over_scan != -2.0) {
-            snprintf(scratch, 8, "%f", op->tv_over_scan);
-            set_option_value(screen, "TVOverScan", scratch);
-        }
-    }
-
     /* add the Coolbits option */
 
     if (op->cool_bits != -1) {
diff --git a/utils.mk b/utils.mk
index b912f98..6e5ec42 100644
--- a/utils.mk
+++ b/utils.mk
@@ -100,6 +100,15 @@ else
   LIBDL_LIBS =
 endif
 
+# This variable controls which floating-point ABI is targeted.  For ARM, it
+# defaults to "gnueabi" for softfp.  Another option is "gnueabihf" for
+# hard(fp).  This is necessary to pick up the correct rtld_test binary.
+# All other architectures default to empty.
+ifeq ($(TARGET_ARCH),armv7l)
+  TARGET_ARCH_ABI     ?= gnueabi
+endif
+TARGET_ARCH_ABI       ?=
+
 OUTPUTDIR             ?= _out/$(TARGET_OS)_$(TARGET_ARCH)
 
 NV_QUIET_COMMAND_REMOVED_TARGET_PREFIX ?=
diff --git a/version.mk b/version.mk
index 2335952..1feef56 100644
--- a/version.mk
+++ b/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 304.51
+NVIDIA_VERSION = 310.14