Merge tag '455.38' into master

8 files changed, 39 insertions, 18 deletions

diff --git a/doc/version.mk b/doc/version.mk
index 14d7f22..3aaff04 100644
--- a/doc/version.mk
+++ b/doc/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 455.28
+NVIDIA_VERSION = 455.38
diff --git a/samples/version.mk b/samples/version.mk
index 14d7f22..3aaff04 100644
--- a/samples/version.mk
+++ b/samples/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 455.28
+NVIDIA_VERSION = 455.38
diff --git a/src/gtk+-2.x/ctkdisplayconfig.c b/src/gtk+-2.x/ctkdisplayconfig.c
index 673e63a..4c1eddd 100644
--- a/src/gtk+-2.x/ctkdisplayconfig.c
+++ b/src/gtk+-2.x/ctkdisplayconfig.c
@@ -2789,6 +2789,8 @@ static void setup_mosaic_config(CtkDisplayConfig *ctk_object)
         (GTK_TOGGLE_BUTTON(ctk_object->chk_mosaic_enabled),
          gpu->mosaic_enabled);
 
+    gtk_widget_set_sensitive(ctk_object->btn_mosaic, gpu->mosaic_enabled);
+
     g_signal_handlers_unblock_by_func
         (G_OBJECT(ctk_object->chk_mosaic_enabled),
          G_CALLBACK(mosaic_state_toggled), (gpointer) ctk_object);
@@ -6328,6 +6330,14 @@ static void mosaic_config_clicked(GtkWidget *widget, gpointer user_data)
                 display = display->next_on_gpu) {
                 nvModeLinePtr modeline;
 
+                if (!display->screen) {
+                    /* Enable any displays that are currently disabled and
+                     * assign them to the mosaic screen.
+                     */
+                    do_enable_display_on_xscreen(ctk_object, display,
+                                                 layout->screens);
+                }
+
                 if (display->num_selected_modes == 0) {
                     generate_selected_modes(display);
                 }
@@ -6349,6 +6359,7 @@ static void mosaic_config_clicked(GtkWidget *widget, gpointer user_data)
 
                     display->cur_mode->pan.x = x_pos;
                     display->cur_mode->pan.y = y_pos;
+                    display->cur_mode->position_type = CONF_ADJ_ABSOLUTE;
 
                     ctk_display_layout_set_mode_modeline(
                         CTK_DISPLAY_LAYOUT(ctk_object->obj_layout),
@@ -9824,7 +9835,6 @@ static void update_layout(CtkDisplayConfig *ctk_object)
     get_cur_screen_pos(ctk_object);
 
     /* Update the apply button */
-    ctk_object->apply_possible = TRUE;
     update_btn_apply(ctk_object, TRUE);
 
     ctk_object->forced_reset_allowed = TRUE; /* OK to reset w/o user input */
diff --git a/src/libXNVCtrl/version.mk b/src/libXNVCtrl/version.mk
index 14d7f22..3aaff04 100644
--- a/src/libXNVCtrl/version.mk
+++ b/src/libXNVCtrl/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 455.28
+NVIDIA_VERSION = 455.38
diff --git a/src/nvml.h b/src/nvml.h
index 56c81e0..7983c65 100644
--- a/src/nvml.h
+++ b/src/nvml.h
@@ -113,6 +113,7 @@ extern "C" {
     #define nvmlDeviceGetGridLicensableFeatures     nvmlDeviceGetGridLicensableFeatures_v3
     #define nvmlEventSetWait                        nvmlEventSetWait_v2
     #define nvmlDeviceGetAttributes                 nvmlDeviceGetAttributes_v2
+    #define nvmlComputeInstanceGetInfo              nvmlComputeInstanceGetInfo_v2
     #define nvmlDeviceGetComputeRunningProcesses    nvmlDeviceGetComputeRunningProcesses_v2
     #define nvmlDeviceGetGraphicsRunningProcesses   nvmlDeviceGetGraphicsRunningProcesses_v2
 #endif // #ifndef NVML_NO_UNVERSIONED_FUNC_DEFS
@@ -7031,10 +7032,10 @@ typedef struct nvmlGpuInstanceProfileInfo_st
 
 typedef struct nvmlGpuInstanceInfo_st
 {
-    nvmlDevice_t device;                  //!< Parent device
-    unsigned int id;                      //!< Unique instance ID within the device
-    unsigned int profileId;               //!< Unique profile ID within the device
-    nvmlGpuInstancePlacement_t placement; //!< Placement for this instance
+    nvmlDevice_t device;                      //!< Parent device
+    unsigned int id;                          //!< Unique instance ID within the device
+    unsigned int profileId;                   //!< Unique profile ID within the device
+    nvmlGpuInstancePlacement_t placement;     //!< Placement for this instance
 } nvmlGpuInstanceInfo_t;
 
 typedef struct nvmlGpuInstance_st* nvmlGpuInstance_t;
@@ -7056,6 +7057,12 @@ typedef struct nvmlGpuInstance_st* nvmlGpuInstance_t;
 #define NVML_COMPUTE_INSTANCE_ENGINE_PROFILE_SHARED 0x0 //!< All the engines except multiprocessors would be shared
 #define NVML_COMPUTE_INSTANCE_ENGINE_PROFILE_COUNT  0x1
 
+typedef struct nvmlComputeInstancePlacement_st
+{
+    unsigned int start;
+    unsigned int size;
+} nvmlComputeInstancePlacement_t;
+
 typedef struct nvmlComputeInstanceProfileInfo_st
 {
     unsigned int id;                    //!< Unique profile ID within the GPU instance
@@ -7071,10 +7078,11 @@ typedef struct nvmlComputeInstanceProfileInfo_st
 
 typedef struct nvmlComputeInstanceInfo_st
 {
-    nvmlDevice_t device;           //!< Parent device
-    nvmlGpuInstance_t gpuInstance; //!< Parent GPU instance
-    unsigned int id;               //!< Unique instance ID within the GPU instance
-    unsigned int profileId;        //!< Unique profile ID within the GPU instance
+    nvmlDevice_t device;                      //!< Parent device
+    nvmlGpuInstance_t gpuInstance;            //!< Parent GPU instance
+    unsigned int id;                          //!< Unique instance ID within the GPU instance
+    unsigned int profileId;                   //!< Unique profile ID within the GPU instance
+    nvmlComputeInstancePlacement_t placement; //!< Placement for this instance within the GPU instance's slice range {0, sliceCount}
 } nvmlComputeInstanceInfo_t;
 
 typedef struct nvmlComputeInstance_st* nvmlComputeInstance_t;
@@ -7083,7 +7091,6 @@ typedef struct nvmlComputeInstance_st* nvmlComputeInstance_t;
  * Set MIG mode for the device.
  *
  * For Ampere &tm; or newer fully supported devices.
- * Supported on Linux only.
  * Requires root user.
  *
  * This mode determines whether a GPU instance can be created.
@@ -7098,6 +7105,9 @@ typedef struct nvmlComputeInstance_st* nvmlComputeInstance_t;
  * unbind fails because the device isn't idle, \ref NVML_ERROR_IN_USE would be returned. The caller of this API
  * is expected to idle the device and retry setting the \a mode.
  *
+ * @note On Windows, only disabling MIG mode is supported. \a activationStatus would return \ref
+ *       NVML_ERROR_NOT_SUPPORTED as GPU reset is not supported on Windows through this API.
+ *
  * @param device                               The identifier of the target device
  * @param mode                                 The mode to be set, \ref NVML_DEVICE_MIG_DISABLE or
  *                                             \ref NVML_DEVICE_MIG_ENABLE
@@ -7116,7 +7126,6 @@ nvmlReturn_t DECLDIR nvmlDeviceSetMigMode(nvmlDevice_t device, unsigned int mode
  * Get MIG mode for the device.
  *
  * For Ampere &tm; or newer fully supported devices.
- * Supported on Linux only.
  *
  * Changing MIG modes may require device unbind or reset. The "pending" MIG mode refers to the target mode following the
  * next activation trigger.
@@ -7472,7 +7481,7 @@ nvmlReturn_t DECLDIR nvmlGpuInstanceGetComputeInstanceById(nvmlGpuInstance_t gpu
  *         - \ref NVML_ERROR_INVALID_ARGUMENT  If \a computeInstance or \a info are invalid
  *         - \ref NVML_ERROR_NO_PERMISSION     If user doesn't have permission to perform the operation
  */
-nvmlReturn_t DECLDIR nvmlComputeInstanceGetInfo(nvmlComputeInstance_t computeInstance, nvmlComputeInstanceInfo_t *info);
+nvmlReturn_t DECLDIR nvmlComputeInstanceGetInfo_v2(nvmlComputeInstance_t computeInstance, nvmlComputeInstanceInfo_t *info);
 
 /**
  * Test if the given handle refers to a MIG device.
@@ -7620,6 +7629,7 @@ nvmlReturn_t DECLDIR nvmlDeviceGetGridLicensableFeatures_v2(nvmlDevice_t device,
 nvmlReturn_t DECLDIR nvmlDeviceRemoveGpu(nvmlPciInfo_t *pciInfo);
 nvmlReturn_t DECLDIR nvmlEventSetWait(nvmlEventSet_t set, nvmlEventData_t * data, unsigned int timeoutms);
 nvmlReturn_t DECLDIR nvmlDeviceGetAttributes(nvmlDevice_t device, nvmlDeviceAttributes_t *attributes);
+nvmlReturn_t DECLDIR nvmlComputeInstanceGetInfo(nvmlComputeInstance_t computeInstance, nvmlComputeInstanceInfo_t *info);
 nvmlReturn_t DECLDIR nvmlDeviceGetComputeRunningProcesses(nvmlDevice_t device, unsigned int *infoCount, nvmlProcessInfo_t *infos);
 nvmlReturn_t DECLDIR nvmlDeviceGetGraphicsRunningProcesses(nvmlDevice_t device, unsigned int *infoCount, nvmlProcessInfo_t *infos);
 #endif // #ifdef NVML_NO_UNVERSIONED_FUNC_DEFS
@@ -7631,6 +7641,7 @@ nvmlReturn_t DECLDIR nvmlDeviceGetGraphicsRunningProcesses(nvmlDevice_t device,
 #undef nvmlDeviceGetGraphicsRunningProcesses
 #undef nvmlDeviceGetComputeRunningProcesses
 #undef nvmlDeviceGetAttributes
+#undef nvmlComputeInstanceGetInfo
 #undef nvmlEventSetWait
 #undef nvmlDeviceGetGridLicensableFeatures
 #undef nvmlDeviceRemoveGpu
diff --git a/src/version.h b/src/version.h
index 7f42b14..50a14c8 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1 +1 @@
-#define NVIDIA_VERSION "455.28"
+#define NVIDIA_VERSION "455.38"
diff --git a/src/version.mk b/src/version.mk
index 14d7f22..3aaff04 100644
--- a/src/version.mk
+++ b/src/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 455.28
+NVIDIA_VERSION = 455.38
diff --git a/version.mk b/version.mk
index 14d7f22..3aaff04 100644
--- a/version.mk
+++ b/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 455.28
+NVIDIA_VERSION = 455.38