Commit 1aa90725 authored by Andreas Beckmann's avatar Andreas Beckmann

Merge tag 'upstream/418.74'

Upstream version 418.74
parents 9cb9210a 2b73efe5
NVIDIA_VERSION = 418.56 NVIDIA_VERSION = 418.74
NVIDIA_VERSION = 418.56 NVIDIA_VERSION = 418.74
...@@ -2030,7 +2030,7 @@ static EditRuleDialog* edit_rule_dialog_new(CtkAppProfile *ctk_app_profile) ...@@ -2030,7 +2030,7 @@ static EditRuleDialog* edit_rule_dialog_new(CtkAppProfile *ctk_app_profile)
dialog->parent = GTK_WIDGET(ctk_app_profile); dialog->parent = GTK_WIDGET(ctk_app_profile);
dialog->top_window = gtk_window_new(GTK_WINDOW_TOPLEVEL); dialog->top_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_modal(GTK_WINDOW(dialog->top_window), TRUE); gtk_window_set_modal(GTK_WINDOW(dialog->top_window), FALSE);
g_signal_connect(G_OBJECT(dialog->top_window), "delete-event", g_signal_connect(G_OBJECT(dialog->top_window), "delete-event",
G_CALLBACK(edit_rule_dialog_handle_delete), dialog); G_CALLBACK(edit_rule_dialog_handle_delete), dialog);
...@@ -2996,7 +2996,7 @@ static EditProfileDialog *edit_profile_dialog_new(CtkAppProfile *ctk_app_profile ...@@ -2996,7 +2996,7 @@ static EditProfileDialog *edit_profile_dialog_new(CtkAppProfile *ctk_app_profile
dialog->setting_toolbar_help_data = NULL; dialog->setting_toolbar_help_data = NULL;
dialog->bottom_help_data = NULL; dialog->bottom_help_data = NULL;
gtk_window_set_modal(GTK_WINDOW(dialog->top_window), TRUE); gtk_window_set_modal(GTK_WINDOW(dialog->top_window), FALSE);
g_signal_connect(G_OBJECT(dialog->top_window), "delete-event", g_signal_connect(G_OBJECT(dialog->top_window), "delete-event",
G_CALLBACK(edit_profile_dialog_handle_delete), dialog); G_CALLBACK(edit_profile_dialog_handle_delete), dialog);
......
...@@ -119,7 +119,7 @@ static gboolean allow_digits(GtkWidget *widget, GdkEvent *event, gpointer user_d ...@@ -119,7 +119,7 @@ static gboolean allow_digits(GtkWidget *widget, GdkEvent *event, gpointer user_d
static gboolean enable_disable_ui_controls(GtkWidget *widget, GdkEvent *event, gpointer user_data); static gboolean enable_disable_ui_controls(GtkWidget *widget, GdkEvent *event, gpointer user_data);
static void update_gui_from_griddconfig(gpointer user_data); static void update_gui_from_griddconfig(gpointer user_data);
static gboolean licenseStateQueryFailed = FALSE; static gboolean licenseStateQueryFailed = FALSE;
static void get_licensed_feature_information(gpointer user_data); static void get_licensable_feature_information(gpointer user_data);
static gboolean is_restart_required(gpointer user_data); static gboolean is_restart_required(gpointer user_data);
static gboolean queryLicensedFeatureCode = TRUE; static gboolean queryLicensedFeatureCode = TRUE;
int64_t licensedFeatureCode = NV_GRID_LICENSE_FEATURE_TYPE_VAPP; int64_t licensedFeatureCode = NV_GRID_LICENSE_FEATURE_TYPE_VAPP;
...@@ -843,7 +843,7 @@ static gboolean update_manage_grid_license_state_info(gpointer user_data) ...@@ -843,7 +843,7 @@ static gboolean update_manage_grid_license_state_info(gpointer user_data)
break; break;
} }
if (queryLicensedFeatureCode == TRUE) { if (queryLicensedFeatureCode == TRUE) {
get_licensed_feature_information(ctk_manage_grid_license); get_licensable_feature_information(ctk_manage_grid_license);
queryLicensedFeatureCode = FALSE; queryLicensedFeatureCode = FALSE;
} }
} }
...@@ -1080,9 +1080,9 @@ static void apply_clicked(GtkWidget *widget, gpointer user_data) ...@@ -1080,9 +1080,9 @@ static void apply_clicked(GtkWidget *widget, gpointer user_data)
} }
/* /*
* get_licensed_feature_information() - Get the details of the feature that is licensed on this system. * get_licensable_feature_information() - Get the details of the supported licensable features on the system.
*/ */
static void get_licensed_feature_information(gpointer user_data) static void get_licensable_feature_information(gpointer user_data)
{ {
CtkManageGridLicense *ctk_manage_grid_license = CTK_MANAGE_GRID_LICENSE(user_data); CtkManageGridLicense *ctk_manage_grid_license = CTK_MANAGE_GRID_LICENSE(user_data);
nvmlGridLicensableFeatures_t *gridLicensableFeatures; nvmlGridLicensableFeatures_t *gridLicensableFeatures;
...@@ -1107,6 +1107,11 @@ static void get_licensed_feature_information(gpointer user_data) ...@@ -1107,6 +1107,11 @@ static void get_licensed_feature_information(gpointer user_data)
licensedFeatureCode = gridLicensableFeatures->gridLicensableFeatures[i].featureCode; licensedFeatureCode = gridLicensableFeatures->gridLicensableFeatures[i].featureCode;
break; break;
} }
else if (gridLicensableFeatures->gridLicensableFeatures[i].featureState == 0 &&
gridLicensableFeatures->gridLicensableFeatures[i].featureCode == NVML_GRID_LICENSE_FEATURE_CODE_VWORKSTATION)
{
break;
}
} }
nvfree(gridLicensableFeatures); nvfree(gridLicensableFeatures);
} }
...@@ -1558,7 +1563,7 @@ GtkWidget* ctk_manage_grid_license_new(CtrlTarget *target, ...@@ -1558,7 +1563,7 @@ GtkWidget* ctk_manage_grid_license_new(CtrlTarget *target,
gtk_box_set_spacing(GTK_BOX(ctk_manage_grid_license), 5); gtk_box_set_spacing(GTK_BOX(ctk_manage_grid_license), 5);
get_licensed_feature_information(ctk_manage_grid_license); get_licensable_feature_information(ctk_manage_grid_license);
/* banner */ /* banner */
......
NVIDIA_VERSION = 418.56 NVIDIA_VERSION = 418.74
...@@ -243,7 +243,7 @@ typedef enum nvmlNvLinkUtilizationCountUnits_enum ...@@ -243,7 +243,7 @@ typedef enum nvmlNvLinkUtilizationCountUnits_enum
NVML_NVLINK_COUNTER_UNIT_CYCLES = 0, // count by cycles NVML_NVLINK_COUNTER_UNIT_CYCLES = 0, // count by cycles
NVML_NVLINK_COUNTER_UNIT_PACKETS = 1, // count by packets NVML_NVLINK_COUNTER_UNIT_PACKETS = 1, // count by packets
NVML_NVLINK_COUNTER_UNIT_BYTES = 2, // count by bytes NVML_NVLINK_COUNTER_UNIT_BYTES = 2, // count by bytes
NVML_NVLINK_COUNTER_UNIT_RESERVED = 3, // count reserved for internal use
// this must be last // this must be last
NVML_NVLINK_COUNTER_UNIT_COUNT NVML_NVLINK_COUNTER_UNIT_COUNT
} nvmlNvLinkUtilizationCountUnits_t; } nvmlNvLinkUtilizationCountUnits_t;
......
#define NVIDIA_VERSION "418.56" #define NVIDIA_VERSION "418.74"
NVIDIA_VERSION = 418.56 NVIDIA_VERSION = 418.74
NVIDIA_VERSION = 418.56 NVIDIA_VERSION = 418.74
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment