Package: release.debian.org
Severity: normal
Tags: bullseye
User: release.debian....@packages.debian.org
Usertags: pu

[ Reason ]
As a followup for enabling src:nvidia-graphics-drivers on ppc64el
(to be in sync with sid), we need to enable building the nvidia-settings
binary package for ppc64el, too.
Lets switch to the latest 470.* upstream release at the same time (to be
in sync again with the driver package), this only has some typo
corrections and the version bump as upstream changes.

[ Impact ]
nvidia-driver:ppc64el has unsatisfiable Recomends.

[ Tests ]
Would require ppc64el hardware with nvidia GPU and nvidia driver usage.

[ Risks ]
There are no risky changes to the binary packages that were previously
built.

[ Checklist ]
  [+] *all* changes are documented in the d/changelog
  [+] I reviewed all changes and I approve them
  [+] attach debdiff against the package in (old)stable
  [+] the issue is verified as fixed in unstable

[ Changes ]

nvidia-settings (470.239.06-1) bullseye; urgency=medium

  * New upstream release 470.141.03.
  * Build for ppc64el.
  * Upload to bullseye.

 -- Andreas Beckmann <a...@debian.org>  Mon, 18 Mar 2024 14:38:21 +0100

 debian/changelog          |  8 ++++++++
 debian/control            |  2 +-
 debian/gbp.conf           |  2 +-
 doc/version.mk            |  2 +-
 samples/version.mk        |  2 +-
 src/libXNVCtrl/version.mk |  2 +-
 src/nvml.h                | 41 +++++++++++++++++++++--------------------
 src/version.mk            |  2 +-
 version.mk                |  2 +-
 9 files changed, 36 insertions(+), 27 deletions(-)


[ Other info ]
I'm not planning to backport the split of src:libxnvctrl from
src:nvidia-settings to bullseye.


Andreas
diff --git a/debian/changelog b/debian/changelog
index 54f627f..504c78e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+nvidia-settings (470.239.06-1) bullseye; urgency=medium
+
+  * New upstream release 470.141.03.
+  * Build for ppc64el.
+  * Upload to bullseye.
+
+ -- Andreas Beckmann <a...@debian.org>  Mon, 18 Mar 2024 14:38:21 +0100
+
 nvidia-settings (470.141.03-1~deb11u1) bullseye; urgency=medium
 
   * Rebuild for bullseye.
diff --git a/debian/control b/debian/control
index 281c4ff..3d776af 100644
--- a/debian/control
+++ b/debian/control
@@ -26,7 +26,7 @@ Vcs-Git: 
https://salsa.debian.org/nvidia-team/nvidia-settings.git
 
 Package: nvidia-settings
 Section: contrib/x11
-Architecture: amd64 arm64
+Architecture: amd64 arm64 ppc64el
 Pre-Depends:
  nvidia-installer-cleanup,
 Depends:
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 8ebcf1c..5cca736 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,5 +1,5 @@
 [DEFAULT]
 upstream-vcs-tag = %(version)s
 upstream-branch = upstream
-debian-branch = master
+debian-branch = bullseye
 debian-tag = debian/%(version)s
diff --git a/doc/version.mk b/doc/version.mk
index cca9ae5..7a608de 100644
--- a/doc/version.mk
+++ b/doc/version.mk
@@ -1,4 +1,4 @@
-NVIDIA_VERSION = 470.141.03
+NVIDIA_VERSION = 470.239.06
 
 # This file.
 VERSION_MK_FILE := $(lastword $(MAKEFILE_LIST))
diff --git a/samples/version.mk b/samples/version.mk
index cca9ae5..7a608de 100644
--- a/samples/version.mk
+++ b/samples/version.mk
@@ -1,4 +1,4 @@
-NVIDIA_VERSION = 470.141.03
+NVIDIA_VERSION = 470.239.06
 
 # This file.
 VERSION_MK_FILE := $(lastword $(MAKEFILE_LIST))
diff --git a/src/libXNVCtrl/version.mk b/src/libXNVCtrl/version.mk
index cca9ae5..7a608de 100644
--- a/src/libXNVCtrl/version.mk
+++ b/src/libXNVCtrl/version.mk
@@ -1,4 +1,4 @@
-NVIDIA_VERSION = 470.141.03
+NVIDIA_VERSION = 470.239.06
 
 # This file.
 VERSION_MK_FILE := $(lastword $(MAKEFILE_LIST))
diff --git a/src/nvml.h b/src/nvml.h
index 4bd1a9e..1db12bf 100644
--- a/src/nvml.h
+++ b/src/nvml.h
@@ -403,6 +403,7 @@ typedef enum nvmlGpuP2PStatus_enum
 {
     NVML_P2P_STATUS_OK     = 0,
     NVML_P2P_STATUS_CHIPSET_NOT_SUPPORED,
+    NVML_P2P_STATUS_CHIPSET_NOT_SUPPORTED = 
NVML_P2P_STATUS_CHIPSET_NOT_SUPPORED,
     NVML_P2P_STATUS_GPU_NOT_SUPPORTED,
     NVML_P2P_STATUS_IOH_TOPOLOGY_NOT_SUPPORTED,
     NVML_P2P_STATUS_DISABLED_BY_REGKEY,
@@ -1813,7 +1814,7 @@ typedef struct nvmlEncoderSessionInfo_st
  */
 typedef enum nvmlFBCSessionType_enum
 {
-    NVML_FBC_SESSION_TYPE_UNKNOWN = 0,     //!< Unknwon
+    NVML_FBC_SESSION_TYPE_UNKNOWN = 0,     //!< Unknown
     NVML_FBC_SESSION_TYPE_TOSYS,           //!< ToSys
     NVML_FBC_SESSION_TYPE_CUDA,            //!< Cuda
     NVML_FBC_SESSION_TYPE_VID,             //!< Vid
@@ -4258,10 +4259,10 @@ nvmlReturn_t DECLDIR nvmlDeviceGetEncoderStats 
(nvmlDevice_t device, unsigned in
  * Retrieves information about active encoder sessions on a target device.
  *
  * An array of active encoder sessions is returned in the caller-supplied 
buffer pointed at by \a sessionInfos. The
- * array elememt count is passed in \a sessionCount, and \a sessionCount is 
used to return the number of sessions
+ * array element count is passed in \a sessionCount, and \a sessionCount is 
used to return the number of sessions
  * written to the buffer.
  *
- * If the supplied buffer is not large enough to accomodate the active session 
array, the function returns
+ * If the supplied buffer is not large enough to accommodate the active 
session array, the function returns
  * NVML_ERROR_INSUFFICIENT_SIZE, with the element count of 
nvmlEncoderSessionInfo_t array required in \a sessionCount.
  * To query the number of active encoder sessions, call this function with 
*sessionCount = 0.  The code will return
  * NVML_SUCCESS with number of active encoder sessions updated in 
*sessionCount.
@@ -4310,7 +4311,7 @@ nvmlReturn_t DECLDIR 
nvmlDeviceGetDecoderUtilization(nvmlDevice_t device, unsign
 * For Maxwell &tm; or newer fully supported devices.
 *
 * @param device                            The identifier of the target device
-* @param fbcStats                          Reference to nvmlFBCStats_t 
structure contianing NvFBC stats
+* @param fbcStats                          Reference to nvmlFBCStats_t 
structure containing NvFBC stats
 *
 * @return
 *         - \ref NVML_SUCCESS                  if \a fbcStats is fetched
@@ -4328,7 +4329,7 @@ nvmlReturn_t DECLDIR nvmlDeviceGetFBCStats(nvmlDevice_t 
device, nvmlFBCStats_t *
 * array element count is passed in \a sessionCount, and \a sessionCount is 
used to return the number of sessions
 * written to the buffer.
 *
-* If the supplied buffer is not large enough to accomodate the active session 
array, the function returns
+* If the supplied buffer is not large enough to accommodate the active session 
array, the function returns
 * NVML_ERROR_INSUFFICIENT_SIZE, with the element count of nvmlFBCSessionInfo_t 
array required in \a sessionCount.
 * To query the number of active FBC sessions, call this function with 
*sessionCount = 0.  The code will return
 * NVML_SUCCESS with number of active FBC sessions updated in *sessionCount.
@@ -4856,7 +4857,7 @@ nvmlReturn_t DECLDIR 
nvmlDeviceGetRetiredPages(nvmlDevice_t device, nvmlPageReti
  * The address information provided from this API is the hardware address of 
the page that was retired.  Note
  * that this does not match the virtual address used in CUDA, but will match 
the address information in XID 63
  *
- * \note nvmlDeviceGetRetiredPages_v2 adds an additional timestamps paramter 
to return the time of each page's
+ * \note nvmlDeviceGetRetiredPages_v2 adds an additional timestamps parameter 
to return the time of each page's
  *       retirement.
  *
  * For Kepler &tm; or newer fully supported devices.
@@ -5193,7 +5194,7 @@ typedef enum nvmlClockLimitId_enum {
  * Set clocks that device will lock to.
  *
  * Sets the clocks that the device will be running at to the value in the 
range of minGpuClockMHz to maxGpuClockMHz.
- * Setting this will supercede application clock values and take effect 
regardless if a cuda app is running.
+ * Setting this will supersede application clock values and take effect 
regardless if a cuda app is running.
  * See /ref nvmlDeviceSetApplicationsClocks
  *
  * Can be used as a setting to request constant performance.
@@ -6218,7 +6219,7 @@ nvmlReturn_t DECLDIR 
nvmlDeviceGetProcessUtilization(nvmlDevice_t device, nvmlPr
  * pointed at by \a vgpuTypeIds. The element count of nvmlVgpuTypeId_t array 
is passed in \a vgpuCount, and \a vgpuCount
  * is used to return the number of vGPU types written to the buffer.
  *
- * If the supplied buffer is not large enough to accomodate the vGPU type 
array, the function returns
+ * If the supplied buffer is not large enough to accommodate the vGPU type 
array, the function returns
  * NVML_ERROR_INSUFFICIENT_SIZE, with the element count of nvmlVgpuTypeId_t 
array required in \a vgpuCount.
  * To query the number of vGPU types supported for the GPU, call this function 
with *vgpuCount = 0.
  * The code will return NVML_ERROR_INSUFFICIENT_SIZE, or NVML_SUCCESS if no 
vGPU types are supported.
@@ -6247,9 +6248,9 @@ nvmlReturn_t DECLDIR 
nvmlDeviceGetSupportedVgpus(nvmlDevice_t device, unsigned i
  * can concurrently run on a device.  For example, if only one vGPU type is 
allowed at a time on a device, then the creatable
  * list will be restricted to whatever vGPU type is already running on the 
device.
  *
- * If the supplied buffer is not large enough to accomodate the vGPU type 
array, the function returns
+ * If the supplied buffer is not large enough to accommodate the vGPU type 
array, the function returns
  * NVML_ERROR_INSUFFICIENT_SIZE, with the element count of nvmlVgpuTypeId_t 
array required in \a vgpuCount.
- * To query the number of vGPU types createable for the GPU, call this 
function with *vgpuCount = 0.
+ * To query the number of vGPU types that can be created for the GPU, call 
this function with *vgpuCount = 0.
  * The code will return NVML_ERROR_INSUFFICIENT_SIZE, or NVML_SUCCESS if no 
vGPU types are creatable.
  *
  * @param device                   The identifier of the target device
@@ -6329,7 +6330,7 @@ nvmlReturn_t DECLDIR 
nvmlVgpuTypeGetGpuInstanceProfileId(nvmlVgpuTypeId_t vgpuTy
  *
  * @param vgpuTypeId               Handle to vGPU type
  * @param deviceID                 Device ID and vendor ID of the device 
contained in single 32 bit value
- * @param subsystemID              Subsytem ID and subsytem vendor ID of the 
device contained in single 32 bit value
+ * @param subsystemID              Subsystem ID and subsystem vendor ID of the 
device contained in single 32 bit value
  *
  * @return
  *         - \ref NVML_SUCCESS                 successful completion
@@ -6468,10 +6469,10 @@ nvmlReturn_t DECLDIR 
nvmlVgpuTypeGetMaxInstancesPerVm(nvmlVgpuTypeId_t vgpuTypeI
  * Retrieve the active vGPU instances on a device.
  *
  * An array of active vGPU instances is returned in the caller-supplied buffer 
pointed at by \a vgpuInstances. The
- * array elememt count is passed in \a vgpuCount, and \a vgpuCount is used to 
return the number of vGPU instances
+ * array element count is passed in \a vgpuCount, and \a vgpuCount is used to 
return the number of vGPU instances
  * written to the buffer.
  *
- * If the supplied buffer is not large enough to accomodate the vGPU instance 
array, the function returns
+ * If the supplied buffer is not large enough to accommodate the vGPU instance 
array, the function returns
  * NVML_ERROR_INSUFFICIENT_SIZE, with the element count of nvmlVgpuInstance_t 
array required in \a vgpuCount.
  * To query the number of active vGPU instances, call this function with 
*vgpuCount = 0.  The code will return
  * NVML_ERROR_INSUFFICIENT_SIZE, or NVML_SUCCESS if no vGPU Types are 
supported.
@@ -6670,7 +6671,7 @@ nvmlReturn_t DECLDIR 
nvmlVgpuInstanceGetEccMode(nvmlVgpuInstance_t vgpuInstance,
  * @param encoderCapacity          Reference to an unsigned int for the 
encoder capacity
  *
  * @return
- *         - \ref NVML_SUCCESS                 if \a encoderCapacity has been 
retrived
+ *         - \ref NVML_SUCCESS                 if \a encoderCapacity has been 
retrieved
  *         - \ref NVML_ERROR_UNINITIALIZED     if the library has not been 
successfully initialized
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  if \a vgpuInstance is 0, or \a 
encoderQueryType is invalid
  *         - \ref NVML_ERROR_NOT_FOUND         if \a vgpuInstance does not 
match a valid active vGPU instance on the system
@@ -6723,7 +6724,7 @@ nvmlReturn_t DECLDIR 
nvmlVgpuInstanceGetEncoderStats(nvmlVgpuInstance_t vgpuInst
  * array element count is passed in \a sessionCount, and \a sessionCount is 
used to return the number of sessions
  * written to the buffer.
  *
- * If the supplied buffer is not large enough to accomodate the active session 
array, the function returns
+ * If the supplied buffer is not large enough to accommodate the active 
session array, the function returns
  * NVML_ERROR_INSUFFICIENT_SIZE, with the element count of 
nvmlEncoderSessionInfo_t array required in \a sessionCount.
  * To query the number of active encoder sessions, call this function with 
*sessionCount = 0. The code will return
  * NVML_SUCCESS with number of active encoder sessions updated in 
*sessionCount.
@@ -6753,7 +6754,7 @@ nvmlReturn_t DECLDIR 
nvmlVgpuInstanceGetEncoderSessions(nvmlVgpuInstance_t vgpuI
 * For Maxwell &tm; or newer fully supported devices.
 *
 * @param vgpuInstance                      Identifier of the target vGPU 
instance
-* @param fbcStats                          Reference to nvmlFBCStats_t 
structure contianing NvFBC stats
+* @param fbcStats                          Reference to nvmlFBCStats_t 
structure containing NvFBC stats
 *
 * @return
 *         - \ref NVML_SUCCESS                  if \a fbcStats is fetched
@@ -6771,7 +6772,7 @@ nvmlReturn_t DECLDIR 
nvmlVgpuInstanceGetFBCStats(nvmlVgpuInstance_t vgpuInstance
 * array element count is passed in \a sessionCount, and \a sessionCount is 
used to return the number of sessions
 * written to the buffer.
 *
-* If the supplied buffer is not large enough to accomodate the active session 
array, the function returns
+* If the supplied buffer is not large enough to accommodate the active session 
array, the function returns
 * NVML_ERROR_INSUFFICIENT_SIZE, with the element count of nvmlFBCSessionInfo_t 
array required in \a sessionCount.
 * To query the number of active FBC sessions, call this function with 
*sessionCount = 0.  The code will return
 * NVML_SUCCESS with number of active FBC sessions updated in *sessionCount.
@@ -6842,7 +6843,7 @@ typedef struct nvmlVgpuMetadata_st
     char                     
guestDriverVersion[NVML_SYSTEM_DRIVER_VERSION_BUFFER_SIZE]; //!< Version of 
driver installed in guest
     char                     
hostDriverVersion[NVML_SYSTEM_DRIVER_VERSION_BUFFER_SIZE];  //!< Version of 
driver installed in host
     unsigned int             reserved[6];                                      
          //!< Reserved for internal use
-    unsigned int             vgpuVirtualizationCaps;                           
          //!< vGPU virtualizaion capabilities bitfileld
+    unsigned int             vgpuVirtualizationCaps;                           
          //!< vGPU virtualization capabilities bitfield
     unsigned int             guestVgpuVersion;                                 
          //!< vGPU version of guest driver
     unsigned int             opaqueDataSize;                                   
          //!< Size of opaque data field in bytes
     char                     opaqueData[4];                                    
          //!< Opaque data
@@ -6856,7 +6857,7 @@ typedef struct nvmlVgpuPgpuMetadata_st
     unsigned int            version;                                           
         //!< Current version of the structure
     unsigned int            revision;                                          
         //!< Current revision of the structure
     char                    
hostDriverVersion[NVML_SYSTEM_DRIVER_VERSION_BUFFER_SIZE];  //!< Host driver 
version
-    unsigned int            pgpuVirtualizationCaps;                            
         //!< Pgpu virtualizaion capabilities bitfileld
+    unsigned int            pgpuVirtualizationCaps;                            
         //!< Pgpu virtualization capabilities bitfield
     unsigned int            reserved[5];                                       
         //!< Reserved for internal use
     nvmlVgpuVersion_t       hostSupportedVgpuRange;                            
         //!< vGPU version range supported by host driver
     unsigned int            opaqueDataSize;                                    
         //!< Size of opaque data field in bytes
@@ -6954,7 +6955,7 @@ nvmlReturn_t DECLDIR 
nvmlDeviceGetVgpuMetadata(nvmlDevice_t device, nvmlVgpuPgpu
  *
  * The caller passes in a buffer via \a compatibilityInfo, into which a 
compatibility information structure is written. The
  * structure defines the states in which the vGPU / VM may be booted on the 
physical GPU. If the vGPU / VM compatibility
- * with the physical GPU is limited, a limit code indicates the factor 
limiting compability.
+ * with the physical GPU is limited, a limit code indicates the factor 
limiting compatability.
  * (see \ref nvmlVgpuPgpuCompatibilityLimitCode_t for details).
  *
  * Note: vGPU compatibility does not take into account dynamic capacity 
conditions that may limit a system's ability to
diff --git a/src/version.mk b/src/version.mk
index cca9ae5..7a608de 100644
--- a/src/version.mk
+++ b/src/version.mk
@@ -1,4 +1,4 @@
-NVIDIA_VERSION = 470.141.03
+NVIDIA_VERSION = 470.239.06
 
 # This file.
 VERSION_MK_FILE := $(lastword $(MAKEFILE_LIST))
diff --git a/version.mk b/version.mk
index cca9ae5..7a608de 100644
--- a/version.mk
+++ b/version.mk
@@ -1,4 +1,4 @@
-NVIDIA_VERSION = 470.141.03
+NVIDIA_VERSION = 470.239.06
 
 # This file.
 VERSION_MK_FILE := $(lastword $(MAKEFILE_LIST))

Reply via email to