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 ...@@ -39,6 +39,10 @@ G_BEGIN_DECLS
#define CTK_MANAGE_GRID_LICENSE_GET_CLASS(obj) \ #define CTK_MANAGE_GRID_LICENSE_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_CLASS ((obj), CTK_TYPE_MANAGE_GRID_LICENSE, CtkMANAGE_GRID_LICENSEClass)) (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 _CtkManageGridLicense CtkManageGridLicense;
typedef struct _CtkManageGridLicenseClass CtkManageGridLicenseClass; typedef struct _CtkManageGridLicenseClass CtkManageGridLicenseClass;
...@@ -64,8 +68,9 @@ struct _CtkManageGridLicense ...@@ -64,8 +68,9 @@ struct _CtkManageGridLicense
DbusData *dbusData; DbusData *dbusData;
CtrlTarget *target; CtrlTarget *target;
gint license_edition_state; gint license_edition_state;
gint feature_type; // Feature type from UI/gridd.conf. gint feature_type; // Feature type from UI/gridd.conf.
int gridd_feature_type; // Feature type fetched from nvidia-gridd. 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) ...@@ -206,7 +206,7 @@ static Bool LoadNvml(NvCtrlNvmlAttributes *nvml)
#define GET_SYMBOL_OPTIONAL(_proc, _name) \ #define GET_SYMBOL_OPTIONAL(_proc, _name) \
nvml->lib._proc = dlsym(nvml->lib.handle, _name); nvml->lib._proc = dlsym(nvml->lib.handle, _name);
GET_SYMBOL_OPTIONAL(deviceGetGridLicensableFeatures, "nvmlDeviceGetGridLicensableFeatures"); GET_SYMBOL_OPTIONAL(deviceGetGridLicensableFeatures, "nvmlDeviceGetGridLicensableFeatures_v2");
#undef GET_SYMBOL_OPTIONAL #undef GET_SYMBOL_OPTIONAL
ret = nvml->lib.init(); ret = nvml->lib.init();
......
...@@ -164,21 +164,21 @@ struct __NvCtrlNvmlAttributes { ...@@ -164,21 +164,21 @@ struct __NvCtrlNvmlAttributes {
struct { struct {
void *handle; void *handle;
typeof(nvmlInit) (*init); typeof(nvmlInit) (*init);
typeof(nvmlShutdown) (*shutdown); typeof(nvmlShutdown) (*shutdown);
typeof(nvmlDeviceGetHandleByIndex) (*deviceGetHandleByIndex); typeof(nvmlDeviceGetHandleByIndex) (*deviceGetHandleByIndex);
typeof(nvmlDeviceGetUUID) (*deviceGetUUID); typeof(nvmlDeviceGetUUID) (*deviceGetUUID);
typeof(nvmlDeviceGetCount) (*deviceGetCount); typeof(nvmlDeviceGetCount) (*deviceGetCount);
typeof(nvmlDeviceGetTemperature) (*deviceGetTemperature); typeof(nvmlDeviceGetTemperature) (*deviceGetTemperature);
typeof(nvmlDeviceGetFanSpeed) (*deviceGetFanSpeed); typeof(nvmlDeviceGetFanSpeed) (*deviceGetFanSpeed);
typeof(nvmlDeviceGetName) (*deviceGetName); typeof(nvmlDeviceGetName) (*deviceGetName);
typeof(nvmlDeviceGetVbiosVersion) (*deviceGetVbiosVersion); typeof(nvmlDeviceGetVbiosVersion) (*deviceGetVbiosVersion);
typeof(nvmlDeviceGetMemoryInfo) (*deviceGetMemoryInfo); typeof(nvmlDeviceGetMemoryInfo) (*deviceGetMemoryInfo);
typeof(nvmlDeviceGetPciInfo) (*deviceGetPciInfo); typeof(nvmlDeviceGetPciInfo) (*deviceGetPciInfo);
typeof(nvmlDeviceGetMaxPcieLinkGeneration) (*deviceGetMaxPcieLinkGeneration); typeof(nvmlDeviceGetMaxPcieLinkGeneration) (*deviceGetMaxPcieLinkGeneration);
typeof(nvmlDeviceGetMaxPcieLinkWidth) (*deviceGetMaxPcieLinkWidth); typeof(nvmlDeviceGetMaxPcieLinkWidth) (*deviceGetMaxPcieLinkWidth);
typeof(nvmlDeviceGetVirtualizationMode) (*deviceGetVirtualizationMode); typeof(nvmlDeviceGetVirtualizationMode) (*deviceGetVirtualizationMode);
typeof(nvmlDeviceGetGridLicensableFeatures) (*deviceGetGridLicensableFeatures); typeof(nvmlDeviceGetGridLicensableFeatures_v2) (*deviceGetGridLicensableFeatures);
} lib; } 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