Commit 8a9dab17 authored by Andreas Beckmann's avatar Andreas Beckmann

New upstream version 390.48

parents fc98d0f4 6d8bbaeb
NVIDIA_VERSION = 390.25 NVIDIA_VERSION = 390.48
NVIDIA_VERSION = 390.25 NVIDIA_VERSION = 390.48
This diff is collapsed.
...@@ -56,10 +56,13 @@ struct _CtkManageGridLicense ...@@ -56,10 +56,13 @@ struct _CtkManageGridLicense
GtkWidget* txt_server_address; GtkWidget* txt_server_address;
GtkWidget* label_license_state; GtkWidget* label_license_state;
GtkWidget* btn_apply; GtkWidget* btn_apply;
GtkWidget* radio_btn_vapp;
GtkWidget* radio_btn_qdws;
GtkWidget* btn_cancel; GtkWidget* btn_cancel;
GtkWidget* box_server_info; GtkWidget* box_server_info;
DbusData *dbusData; DbusData *dbusData;
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.
...@@ -82,6 +85,8 @@ typedef enum ...@@ -82,6 +85,8 @@ typedef enum
NV_GRID_LICENSE_EXPIRED_VGPU, NV_GRID_LICENSE_EXPIRED_VGPU,
NV_GRID_LICENSE_EXPIRED_QDWS, NV_GRID_LICENSE_EXPIRED_QDWS,
NV_GRID_LICENSE_RESTART_REQUIRED, NV_GRID_LICENSE_RESTART_REQUIRED,
NV_GRID_LICENSE_RESTART_REQUIRED_VAPP,
NV_GRID_UNLICENSED_REQUEST_DETAILS, // Default case
} licenseStatus; } licenseStatus;
struct _CtkManageGridLicenseClass struct _CtkManageGridLicenseClass
......
NVIDIA_VERSION = 390.25 NVIDIA_VERSION = 390.48
...@@ -272,7 +272,9 @@ typedef enum { ...@@ -272,7 +272,9 @@ typedef enum {
#define NV_CTRL_ATTR_NVML_GPU_GRID_LICENSE_SUPPORTED_FALSE 0 #define NV_CTRL_ATTR_NVML_GPU_GRID_LICENSE_SUPPORTED_FALSE 0
#define NV_CTRL_ATTR_NVML_GPU_GRID_LICENSE_SUPPORTED_TRUE 1 #define NV_CTRL_ATTR_NVML_GPU_GRID_LICENSE_SUPPORTED_TRUE 1
#define NV_CTRL_ATTR_NVML_LAST_ATTRIBUTE (NV_CTRL_ATTR_NVML_GPU_GRID_LICENSE_SUPPORTED) #define NV_CTRL_ATTR_NVML_GPU_GRID_LICENSABLE_FEATURES (NV_CTRL_ATTR_NVML_BASE + 2)
#define NV_CTRL_ATTR_NVML_LAST_ATTRIBUTE (NV_CTRL_ATTR_NVML_GPU_GRID_LICENSABLE_FEATURES)
#define NV_CTRL_ATTR_LAST_ATTRIBUTE \ #define NV_CTRL_ATTR_LAST_ATTRIBUTE \
(NV_CTRL_ATTR_NVML_LAST_ATTRIBUTE) (NV_CTRL_ATTR_NVML_LAST_ATTRIBUTE)
......
...@@ -895,6 +895,54 @@ static ReturnStatus NvCtrlNvmlGetGPUAttribute(const CtrlTarget *ctrl_target, ...@@ -895,6 +895,54 @@ static ReturnStatus NvCtrlNvmlGetGPUAttribute(const CtrlTarget *ctrl_target,
return NvCtrlNotSupported; return NvCtrlNotSupported;
} }
static ReturnStatus NvCtrlNvmlGetGridLicensableFeatures(const CtrlTarget *ctrl_target,
int attr, nvmlGridLicensableFeatures_t **val)
{
const NvCtrlAttributePrivateHandle *h = getPrivateHandleConst(ctrl_target);
const NvCtrlNvmlAttributes *nvml;
nvmlDevice_t device;
nvmlReturn_t ret;
if ((h == NULL) || (h->nvml == NULL)) {
return NvCtrlBadHandle;
}
nvml = h->nvml;
ret = nvml->lib.deviceGetHandleByIndex(nvml->deviceIdx, &device);
if (ret == NVML_SUCCESS) {
switch (attr) {
case NV_CTRL_ATTR_NVML_GPU_GRID_LICENSABLE_FEATURES:
if (nvml->lib.deviceGetGridLicensableFeatures) {
nvmlGridLicensableFeatures_t *gridLicensableFeatures;
gridLicensableFeatures = (nvmlGridLicensableFeatures_t *)nvalloc(sizeof(nvmlGridLicensableFeatures_t));
ret = nvml->lib.deviceGetGridLicensableFeatures(device,
gridLicensableFeatures);
if (ret == NVML_SUCCESS) {
*val = gridLicensableFeatures;
return NvCtrlSuccess;
}
} else {
/* return NvCtrlNotSupported against older driver */
ret = NVML_ERROR_FUNCTION_NOT_FOUND;
}
break;
default:
/* Did we forget to handle a GPU integer attribute? */
nv_warning_msg("Unhandled integer attribute %s (%d) of GPU "
"(%d)", INT_ATTRIBUTE_NAME(attr), attr,
NvCtrlGetTargetId(ctrl_target));
return NvCtrlNotSupported;
}
}
/* An NVML error occurred */
printNvmlError(ret);
return NvCtrlNotSupported;
}
#ifdef NVML_EXPERIMENTAL #ifdef NVML_EXPERIMENTAL
static int getThermalCoolerId(const NvCtrlAttributePrivateHandle *h, static int getThermalCoolerId(const NvCtrlAttributePrivateHandle *h,
...@@ -1072,6 +1120,28 @@ ReturnStatus NvCtrlNvmlGetAttribute(const CtrlTarget *ctrl_target, ...@@ -1072,6 +1120,28 @@ ReturnStatus NvCtrlNvmlGetAttribute(const CtrlTarget *ctrl_target,
} }
ReturnStatus NvCtrlNvmlGetGridLicenseAttributes(const CtrlTarget *ctrl_target,
int attr, nvmlGridLicensableFeatures_t **val)
{
if (NvmlMissing(ctrl_target)) {
return NvCtrlMissingExtension;
}
/*
* This should't be reached for target types that are not handled through
* NVML (Keep TARGET_TYPE_IS_NVML_COMPATIBLE in NvCtrlAttributesPrivate.h up
* to date).
*/
assert(TARGET_TYPE_IS_NVML_COMPATIBLE(NvCtrlGetTargetType(ctrl_target)));
if (NvCtrlGetTargetType(ctrl_target) == GPU_TARGET) {
return NvCtrlNvmlGetGridLicensableFeatures(ctrl_target, attr, val);
}
else {
return NvCtrlBadHandle;
}
}
/* /*
* Set NVML Attribute Values * Set NVML Attribute Values
......
...@@ -427,6 +427,8 @@ ReturnStatus NvCtrlNvmlSetStringAttribute(CtrlTarget *ctrl_target, ...@@ -427,6 +427,8 @@ ReturnStatus NvCtrlNvmlSetStringAttribute(CtrlTarget *ctrl_target,
int attr, const char *ptr); int attr, const char *ptr);
ReturnStatus NvCtrlNvmlGetAttribute(const CtrlTarget *ctrl_target, ReturnStatus NvCtrlNvmlGetAttribute(const CtrlTarget *ctrl_target,
int attr, int64_t *val); int attr, int64_t *val);
ReturnStatus NvCtrlNvmlGetGridLicenseAttributes(const CtrlTarget *ctrl_target,
int attr, nvmlGridLicensableFeatures_t **val);
ReturnStatus NvCtrlNvmlSetAttribute(CtrlTarget *ctrl_target, int attr, ReturnStatus NvCtrlNvmlSetAttribute(CtrlTarget *ctrl_target, int attr,
int index, int val); int index, int val);
ReturnStatus ReturnStatus
......
...@@ -1144,12 +1144,6 @@ typedef struct nvmlEventData_st ...@@ -1144,12 +1144,6 @@ typedef struct nvmlEventData_st
*/ */
#define nvmlClocksThrottleReasonSyncBoost 0x0000000000000010LL #define nvmlClocksThrottleReasonSyncBoost 0x0000000000000010LL
/** GPU clocks are limited by current setting of Display clocks
*
* @see bug 1997531
*/
#define nvmlClocksThrottleReasonDisplayClockSetting 0x0000000000000020LL
/** Bit mask representing no clocks throttling /** Bit mask representing no clocks throttling
* *
* Clocks are as high as possible. * Clocks are as high as possible.
...@@ -1165,7 +1159,6 @@ typedef struct nvmlEventData_st ...@@ -1165,7 +1159,6 @@ typedef struct nvmlEventData_st
| nvmlClocksThrottleReasonSwPowerCap \ | nvmlClocksThrottleReasonSwPowerCap \
| nvmlClocksThrottleReasonHwSlowdown \ | nvmlClocksThrottleReasonHwSlowdown \
| nvmlClocksThrottleReasonSyncBoost \ | nvmlClocksThrottleReasonSyncBoost \
| nvmlClocksThrottleReasonDisplayClockSetting \
) )
/** @} */ /** @} */
......
#define NVIDIA_VERSION "390.25" #define NVIDIA_VERSION "390.48"
NVIDIA_VERSION = 390.25 NVIDIA_VERSION = 390.48
NVIDIA_VERSION = 390.25 NVIDIA_VERSION = 390.48
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