Bug#990175: unblock: nvidia-settings/460.73.01-1
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package nvidia-settings
Let's bring the versions of nvidia-settings and nvidia-graphics-drivers
in sync. Packaging wise the icon is moved out of the legacy pixmaps location.
unblock nvidia-settings/460.73.01-1
Andreas
diff -Nru nvidia-settings-460.56/debian/changelog nvidia-settings-460.73.01/debian/changelog
--- nvidia-settings-460.56/debian/changelog 2021-03-01 10:03:33.000000000 +0100
+++ nvidia-settings-460.73.01/debian/changelog 2021-05-25 09:45:09.000000000 +0200
@@ -1,3 +1,14 @@
+nvidia-settings (460.73.01-1) unstable; urgency=medium
+
+ [ Andreas Beckmann ]
+ * New upstream release 460.73.01.
+
+ [ Pino Toscano ]
+ * Install nvidia-settings.png in the hicolor icon theme, rather than the
+ legacy pixmaps location.
+
+ -- Andreas Beckmann <anbe@debian.org> Tue, 25 May 2021 09:45:09 +0200
+
nvidia-settings (460.56-1) unstable; urgency=medium
* New upstream release 460.56.
diff -Nru nvidia-settings-460.56/debian/nvidia-settings.install.in nvidia-settings-460.73.01/debian/nvidia-settings.install.in
--- nvidia-settings-460.56/debian/nvidia-settings.install.in 2021-03-01 10:03:33.000000000 +0100
+++ nvidia-settings-460.73.01/debian/nvidia-settings.install.in 2021-05-25 09:45:09.000000000 +0200
@@ -1,6 +1,6 @@
usr/bin/nvidia-settings usr/lib/#PRIVATE#/
debian/nvidia-settings.desktop usr/lib/#PRIVATE#/
-nvidia-settings#VARIANT#.png usr/share/pixmaps/
+usr/share/icons/
usr/bin/nv-control-dpy usr/lib/#PRIVATE#/
usr/share/man/man1/nvidia-settings.1.gz usr/lib/#PRIVATE#/
usr/lib/libnvidia-gtk?.so.*
diff -Nru nvidia-settings-460.56/debian/rules nvidia-settings-460.73.01/debian/rules
--- nvidia-settings-460.56/debian/rules 2021-03-01 10:03:33.000000000 +0100
+++ nvidia-settings-460.73.01/debian/rules 2021-05-25 09:45:09.000000000 +0200
@@ -65,7 +65,8 @@
override_dh_auto_install:
dh_auto_install --destdir=debian/tmp
install -m 0755 samples/$(OUTPUTDIR)/nv-control-dpy debian/tmp/usr/bin/
- install -m 0644 doc/nvidia-settings.png debian/tmp/nvidia-settings$(-variant).png
+ install -d -m 0755 debian/tmp/usr/share/icons/hicolor/128x128/apps/
+ install -m 0644 doc/nvidia-settings.png debian/tmp/usr/share/icons/hicolor/128x128/apps/nvidia-settings$(-variant).png
endif
execute_after_dh_auto_clean:
diff -Nru nvidia-settings-460.56/doc/version.mk nvidia-settings-460.73.01/doc/version.mk
--- nvidia-settings-460.56/doc/version.mk 2021-02-24 00:41:38.000000000 +0100
+++ nvidia-settings-460.73.01/doc/version.mk 2021-04-01 23:56:49.000000000 +0200
@@ -1,4 +1,4 @@
-NVIDIA_VERSION = 460.56
+NVIDIA_VERSION = 460.73.01
# This file.
VERSION_MK_FILE := $(lastword $(MAKEFILE_LIST))
diff -Nru nvidia-settings-460.56/samples/version.mk nvidia-settings-460.73.01/samples/version.mk
--- nvidia-settings-460.56/samples/version.mk 2021-02-24 00:41:38.000000000 +0100
+++ nvidia-settings-460.73.01/samples/version.mk 2021-04-01 23:56:53.000000000 +0200
@@ -1,4 +1,4 @@
-NVIDIA_VERSION = 460.56
+NVIDIA_VERSION = 460.73.01
# This file.
VERSION_MK_FILE := $(lastword $(MAKEFILE_LIST))
diff -Nru nvidia-settings-460.56/src/libXNVCtrl/version.mk nvidia-settings-460.73.01/src/libXNVCtrl/version.mk
--- nvidia-settings-460.56/src/libXNVCtrl/version.mk 2021-02-24 00:41:38.000000000 +0100
+++ nvidia-settings-460.73.01/src/libXNVCtrl/version.mk 2021-04-01 23:56:49.000000000 +0200
@@ -1,4 +1,4 @@
-NVIDIA_VERSION = 460.56
+NVIDIA_VERSION = 460.73.01
# This file.
VERSION_MK_FILE := $(lastword $(MAKEFILE_LIST))
diff -Nru nvidia-settings-460.56/src/nvml.h nvidia-settings-460.73.01/src/nvml.h
--- nvidia-settings-460.56/src/nvml.h 2021-02-24 00:41:40.000000000 +0100
+++ nvidia-settings-460.73.01/src/nvml.h 2021-04-01 23:57:00.000000000 +0200
@@ -345,6 +345,7 @@
NVML_NVLINK_ERROR_DL_RECOVERY = 1, // Data link transmit recovery error counter
NVML_NVLINK_ERROR_DL_CRC_FLIT = 2, // Data link receive flow control digit CRC error counter
NVML_NVLINK_ERROR_DL_CRC_DATA = 3, // Data link receive data CRC error counter
+ NVML_NVLINK_ERROR_DL_ECC_DATA = 4, // Data link receive data ECC error counter
// this must be last
NVML_NVLINK_ERROR_COUNT
@@ -553,8 +554,8 @@
NVML_BRAND_QUADRO_RTX = 12,
NVML_BRAND_NVIDIA_RTX = 13,
NVML_BRAND_NVIDIA = 14,
- NVML_BRAND_GEFORCE_RTX = 15,
- NVML_BRAND_TITAN_RTX = 16,
+ NVML_BRAND_GEFORCE_RTX = 15, // Unused
+ NVML_BRAND_TITAN_RTX = 16, // Unused
// Keep this last
NVML_BRAND_COUNT
@@ -849,6 +850,20 @@
NVML_RESTRICTED_API_COUNT
} nvmlRestrictedAPI_t;
+/**
+ * Enum to represent NvLink ECC per-lane error counts
+ */
+typedef enum nvmlNvLinkEccLaneErrorCounter_enum
+{
+ NVML_NVLINK_ERROR_DL_ECC_LANE0 = 0, // Data link receive ECC error counter lane 0
+ NVML_NVLINK_ERROR_DL_ECC_LANE1 = 1, // Data link receive ECC error counter lane 1
+ NVML_NVLINK_ERROR_DL_ECC_LANE2 = 2, // Data link receive ECC error counter lane 2
+ NVML_NVLINK_ERROR_DL_ECC_LANE3 = 3, // Data link receive ECC error counter lane 3
+
+ // this must be last
+ NVML_NVLINK_ERROR_DL_ECC_COUNT
+} nvmlNvLinkEccLaneErrorCounter_t;
+
/** @} */
/***************************************************************************************************/
@@ -902,8 +917,12 @@
* vGPU software licensable features
*/
typedef enum {
- NVML_GRID_LICENSE_FEATURE_CODE_VGPU = 1, //!< Virtual GPU
- NVML_GRID_LICENSE_FEATURE_CODE_VWORKSTATION = 2 //!< Virtual Workstation
+ NVML_GRID_LICENSE_FEATURE_CODE_UNKNOWN = 0, //!< Unknown
+ NVML_GRID_LICENSE_FEATURE_CODE_VGPU = 1, //!< Virtual GPU
+ NVML_GRID_LICENSE_FEATURE_CODE_NVIDIA_RTX = 2, //!< Nvidia RTX
+ NVML_GRID_LICENSE_FEATURE_CODE_VWORKSTATION = NVML_GRID_LICENSE_FEATURE_CODE_NVIDIA_RTX, //!< Deprecated, do not use.
+ NVML_GRID_LICENSE_FEATURE_CODE_GAMING = 3, //!< Gaming
+ NVML_GRID_LICENSE_FEATURE_CODE_COMPUTE = 4 //!< Compute
} nvmlGridLicenseFeatureCode_t;
/** @} */
@@ -1271,7 +1290,26 @@
*/
#define NVML_FI_DEV_NVSWITCH_CONNECTED_LINK_COUNT 147 //!< Number of NVLinks connected to NVSwitch
-#define NVML_FI_MAX 148 //!< One greater than the largest field ID defined above
+/* NvLink ECC Data Error Counters
+ *
+ * Lane ID needs to be specified in the scopeId field in nvmlFieldValue_t.
+ *
+ */
+#define NVML_FI_DEV_NVLINK_ECC_DATA_ERROR_COUNT_L0 148 //!< NVLink data ECC Error Counter for Link 0
+#define NVML_FI_DEV_NVLINK_ECC_DATA_ERROR_COUNT_L1 149 //!< NVLink data ECC Error Counter for Link 1
+#define NVML_FI_DEV_NVLINK_ECC_DATA_ERROR_COUNT_L2 150 //!< NVLink data ECC Error Counter for Link 2
+#define NVML_FI_DEV_NVLINK_ECC_DATA_ERROR_COUNT_L3 151 //!< NVLink data ECC Error Counter for Link 3
+#define NVML_FI_DEV_NVLINK_ECC_DATA_ERROR_COUNT_L4 152 //!< NVLink data ECC Error Counter for Link 4
+#define NVML_FI_DEV_NVLINK_ECC_DATA_ERROR_COUNT_L5 153 //!< NVLink data ECC Error Counter for Link 5
+#define NVML_FI_DEV_NVLINK_ECC_DATA_ERROR_COUNT_L6 154 //!< NVLink data ECC Error Counter for Link 6
+#define NVML_FI_DEV_NVLINK_ECC_DATA_ERROR_COUNT_L7 155 //!< NVLink data ECC Error Counter for Link 7
+#define NVML_FI_DEV_NVLINK_ECC_DATA_ERROR_COUNT_L8 156 //!< NVLink data ECC Error Counter for Link 8
+#define NVML_FI_DEV_NVLINK_ECC_DATA_ERROR_COUNT_L9 157 //!< NVLink data ECC Error Counter for Link 9
+#define NVML_FI_DEV_NVLINK_ECC_DATA_ERROR_COUNT_L10 158 //!< NVLink data ECC Error Counter for Link 10
+#define NVML_FI_DEV_NVLINK_ECC_DATA_ERROR_COUNT_L11 159 //!< NVLink data ECC Error Counter for Link 11
+#define NVML_FI_DEV_NVLINK_ECC_DATA_ERROR_COUNT_TOTAL 160 //!< NvLink data ECC Error Counter total for all Links
+
+#define NVML_FI_MAX 161 //!< One greater than the largest field ID defined above
/**
* Information for a Field Value Sample
@@ -4119,7 +4157,6 @@
* - \ref NVML_ERROR_INVALID_ARGUMENT if \a sessionCount, or \a device or \a averageFps,
* or \a averageLatency is NULL
* - \ref NVML_ERROR_GPU_IS_LOST if the target GPU has fallen off the bus or is otherwise inaccessible
- * - \ref NVML_ERROR_NOT_SUPPORTED if this query is not supported by \a device
* - \ref NVML_ERROR_UNKNOWN on any unexpected error
*/
nvmlReturn_t DECLDIR nvmlDeviceGetEncoderStats (nvmlDevice_t device, unsigned int *sessionCount,
diff -Nru nvidia-settings-460.56/src/version.mk nvidia-settings-460.73.01/src/version.mk
--- nvidia-settings-460.56/src/version.mk 2021-02-24 00:41:38.000000000 +0100
+++ nvidia-settings-460.73.01/src/version.mk 2021-04-01 23:56:49.000000000 +0200
@@ -1,4 +1,4 @@
-NVIDIA_VERSION = 460.56
+NVIDIA_VERSION = 460.73.01
# This file.
VERSION_MK_FILE := $(lastword $(MAKEFILE_LIST))
diff -Nru nvidia-settings-460.56/version.mk nvidia-settings-460.73.01/version.mk
--- nvidia-settings-460.56/version.mk 2021-02-24 00:41:38.000000000 +0100
+++ nvidia-settings-460.73.01/version.mk 2021-04-01 23:56:49.000000000 +0200
@@ -1,4 +1,4 @@
-NVIDIA_VERSION = 460.56
+NVIDIA_VERSION = 460.73.01
# This file.
VERSION_MK_FILE := $(lastword $(MAKEFILE_LIST))
Reply to: