Commit e890c9e9 authored by Andreas Beckmann's avatar Andreas Beckmann

Merge tag 'upstream/410.104'

Upstream version 410.104
parents 23dee38a 9549e140
NVIDIA_VERSION = 410.93
NVIDIA_VERSION = 410.104
NVIDIA_VERSION = 410.93
NVIDIA_VERSION = 410.104
This diff is collapsed.
......@@ -39,6 +39,10 @@ G_BEGIN_DECLS
#define CTK_MANAGE_GRID_LICENSE_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_CLASS ((obj), CTK_TYPE_MANAGE_GRID_LICENSE, CtkMANAGE_GRID_LICENSEClass))
#define GRID_LICENSE_INFO_MAX_LENGTH 128
#define GRID_MESSAGE_MAX_BUFFER_SIZE 512
#define GRID_VIRTUAL_APPLICATIONS "GRID Virtual Applications"
typedef struct _CtkManageGridLicense CtkManageGridLicense;
typedef struct _CtkManageGridLicenseClass CtkManageGridLicenseClass;
......@@ -66,6 +70,7 @@ struct _CtkManageGridLicense
gint license_edition_state;
gint feature_type; // Feature type from UI/gridd.conf.
int gridd_feature_type; // Feature type fetched from nvidia-gridd.
char productName[GRID_LICENSE_INFO_MAX_LENGTH]; // GRID product name fetched from nvml.
};
/*
......
NVIDIA_VERSION = 410.93
NVIDIA_VERSION = 410.104
......@@ -206,7 +206,7 @@ static Bool LoadNvml(NvCtrlNvmlAttributes *nvml)
#define GET_SYMBOL_OPTIONAL(_proc, _name) \
nvml->lib._proc = dlsym(nvml->lib.handle, _name);
GET_SYMBOL_OPTIONAL(deviceGetGridLicensableFeatures, "nvmlDeviceGetGridLicensableFeatures");
GET_SYMBOL_OPTIONAL(deviceGetGridLicensableFeatures, "nvmlDeviceGetGridLicensableFeatures_v2");
#undef GET_SYMBOL_OPTIONAL
ret = nvml->lib.init();
......
......@@ -178,7 +178,7 @@ struct __NvCtrlNvmlAttributes {
typeof(nvmlDeviceGetMaxPcieLinkGeneration) (*deviceGetMaxPcieLinkGeneration);
typeof(nvmlDeviceGetMaxPcieLinkWidth) (*deviceGetMaxPcieLinkWidth);
typeof(nvmlDeviceGetVirtualizationMode) (*deviceGetVirtualizationMode);
typeof(nvmlDeviceGetGridLicensableFeatures) (*deviceGetGridLicensableFeatures);
typeof(nvmlDeviceGetGridLicensableFeatures_v2) (*deviceGetGridLicensableFeatures);
} lib;
......
This diff is collapsed.
#define NVIDIA_VERSION "410.93"
#define NVIDIA_VERSION "410.104"
NVIDIA_VERSION = 410.93
NVIDIA_VERSION = 410.104
NVIDIA_VERSION = 410.93
NVIDIA_VERSION = 410.104
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