387.12387.12

4 files changed, 42 insertions, 15 deletions

diff --git a/nvidia-cfg.h b/nvidia-cfg.h
index 41c7a54..f82427f 100644
--- a/nvidia-cfg.h
+++ b/nvidia-cfg.h
@@ -415,7 +415,7 @@ NvCfgGSyncDeviceType nvCfgGetGSyncDeviceType(NvCfgGSyncHandle handle);
 
 
 /*
- * nvCfgGetGSyncDeviceFirmwareVersion() - returns the firmware major version of
+ * nvCfgGetGSyncDeviceFirmwareVersion() - returns the firmware version of
  * the GSync device referenced by handle.
  */
 
@@ -423,14 +423,6 @@ int nvCfgGetGSyncDeviceFirmwareVersion(NvCfgGSyncHandle handle);
 
 
 /*
- * nvCfgGetGSyncDeviceFirmwareMinorVersion() - returns the firmware minor
- * version of the GSync device referenced by handle.
- */
-
-int nvCfgGetGSyncDeviceFirmwareMinorVersion(NvCfgGSyncHandle handle);
-
-
-/*
  * nvCfgFlashGSyncDevice() - flashes the GSync device referenced by handle.
  * format contains the firmware format, newFirmwareImage contains the
  * new firmware image to be flashed, and size contains the size of
diff --git a/option_table.h b/option_table.h
index c0735fa..87718df 100644
--- a/option_table.h
+++ b/option_table.h
@@ -644,10 +644,11 @@ static const NVGetoptOption __options[] = {
 
     { "force-yuv-420", XCONFIG_BOOL_VAL(FORCE_YUV_420),
       NVGETOPT_IS_BOOLEAN, NULL, "Enable or disable the "
-      "\"ForceYUV420\" X configuration option. Setting this option "
-      "will enable YUV 4:2:0 compression on HDMI 2.0 4K@60hz modes "
-      "if possible, even if the current display and GPU both support "
-      "uncompressed RGB 4:4:4 output with these modes." },
+      "\"ForceYUV420\" X configuration option. If the current display and GPU "
+      "both support uncompressed RGB 4:4:4 output and YUV 4:2:0 compressed "
+      "output with the current mode, then RGB 4:4:4 output is selected by "
+      "default. This option forces the use of YUV 4:2:0 output (where "
+      "supported) instead." },
 
     { "force-composition-pipeline", FORCE_COMPOSITION_PIPELINE_OPTION,
       NVGETOPT_STRING_ARGUMENT | NVGETOPT_ALLOW_DISABLE, NULL,
diff --git a/utils.mk b/utils.mk
index 31d40f9..66dbb16 100644
--- a/utils.mk
+++ b/utils.mk
@@ -80,6 +80,7 @@ HOSTNAME_CMD          ?= hostname
 DATE                  ?= date
 GZIP_CMD              ?= gzip
 CHMOD                 ?= chmod
+OBJCOPY               ?= objcopy
 
 NV_AUTO_DEPEND        ?= 1
 NV_VERBOSE            ?= 0
@@ -271,10 +272,14 @@ endif
 NV_MODULE_LOGGING_NAME ?=
 
 ifeq ($(NV_VERBOSE),0)
-  quiet_cmd = @$(PRINTF) \
+  at_if_quiet := @
+  quiet_cmd_no_at = $(PRINTF) \
     " $(if $(NV_MODULE_LOGGING_NAME),[ %-17.17s ],%s)  $(quiet_$(1))\n" \
     "$(NV_MODULE_LOGGING_NAME)" && $($(1))
+  quiet_cmd = @$(quiet_cmd_no_at)
 else
+  at_if_quiet :=
+  quiet_cmd_no_at = $($(1))
   quiet_cmd = $($(1))
 endif
 
@@ -295,6 +300,8 @@ quiet_HOST_LINK    = $(call define_quiet_cmd,HOST_LINK   ,$@)
 quiet_M4           = $(call define_quiet_cmd,M4          ,$<)
 quiet_STRIP_CMD    = $(call define_quiet_cmd,STRIP       ,$@)
 quiet_HARDLINK     = $(call define_quiet_cmd,HARDLINK    ,$@)
+quiet_LD           = $(call define_quiet_cmd,LD          ,$@)
+quiet_OBJCOPY      = $(call define_quiet_cmd,OBJCOPY     ,$@)
 
 ##############################################################################
 # Tell gmake to delete the target of a rule if it has changed and its
@@ -447,3 +454,30 @@ define DEFINE_STAMP_C_RULE
 	@ $$(PRINTF) "%s\n" "const char *pNV_ID = NV_ID + 11;"          >> $$@
 
 endef
+
+##############################################################################
+# Define rules that can be used for embedding a file into an ELF object that
+# contains the raw contents of that file and symbols pointing to the embedded
+# data.
+#
+# Note that objcopy will name the symbols in the resulting object file based on
+# the filename specified in $(1).  For example,
+#
+#   $(eval $(call $(READ_ONLY_OBJECT_FROM_FILE_RULE),a/b/c))
+#
+# will create an object named $(OUTPUTDIR)/c.o with the symbols _binary_c_start,
+# _binary_c_end, and _binary_c_size.
+#
+# Arguments:
+#  $(1): Path to the file to convert
+##############################################################################
+
+define READ_ONLY_OBJECT_FROM_FILE_RULE
+  $$(OUTPUTDIR)/$$(notdir $(1)).o: $(1)
+	$(at_if_quiet)cd $$(dir $(1)); \
+	$$(call quiet_cmd_no_at,LD) -r -z noexecstack --format=binary \
+	    $$(notdir $(1)) -o $$(OUTPUTDIR_ABSOLUTE)/$$(notdir $$@)
+	$$(call quiet_cmd,OBJCOPY) \
+	    --rename-section .data=.rodata,contents,alloc,load,data,readonly \
+	    $$@
+endef
diff --git a/version.mk b/version.mk
index aa3eccc..d4f3767 100644
--- a/version.mk
+++ b/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 384.90
+NVIDIA_VERSION = 387.12