diff options
author | Aaron Plattner <aplattner@nvidia.com> | 2020-06-24 14:00:27 -0700 |
---|---|---|
committer | Aaron Plattner <aplattner@nvidia.com> | 2020-06-24 14:01:51 -0700 |
commit | 31b847f0e49c1952476b309a71d10bfcdb8d4ca3 (patch) | |
tree | e2a05020ffc7ee23acc0b8645a09bf56c0b1e093 | |
parent | a7c1f5fce6303a643fadff7d85d59934bd0cf6b6 (diff) |
-rw-r--r-- | doc/version.mk | 2 | ||||
-rw-r--r-- | samples/version.mk | 2 | ||||
-rw-r--r-- | src/gtk+-2.x/ctkevent.c | 2 | ||||
-rw-r--r-- | src/libXNVCtrl/NVCtrl.h | 13 | ||||
-rw-r--r-- | src/libXNVCtrl/version.mk | 2 | ||||
-rw-r--r-- | src/libXNVCtrlAttributes/NvCtrlAttributes.h | 1 | ||||
-rw-r--r-- | src/libXNVCtrlAttributes/NvCtrlAttributesUtils.c | 3 | ||||
-rw-r--r-- | src/nvml.h | 1 | ||||
-rw-r--r-- | src/parse.c | 2 | ||||
-rw-r--r-- | src/version.h | 2 | ||||
-rw-r--r-- | src/version.mk | 2 | ||||
-rw-r--r-- | version.mk | 2 |
12 files changed, 25 insertions, 9 deletions
diff --git a/doc/version.mk b/doc/version.mk index 7ae2f13..7a63ce9 100644 --- a/doc/version.mk +++ b/doc/version.mk @@ -1 +1 @@ -NVIDIA_VERSION = 440.82 +NVIDIA_VERSION = 440.100 diff --git a/samples/version.mk b/samples/version.mk index 7ae2f13..7a63ce9 100644 --- a/samples/version.mk +++ b/samples/version.mk @@ -1 +1 @@ -NVIDIA_VERSION = 440.82 +NVIDIA_VERSION = 440.100 diff --git a/src/gtk+-2.x/ctkevent.c b/src/gtk+-2.x/ctkevent.c index 1be7413..a29d6f9 100644 --- a/src/gtk+-2.x/ctkevent.c +++ b/src/gtk+-2.x/ctkevent.c @@ -419,7 +419,7 @@ static void ctk_event_class_init(CtkEventClass *ctk_event_class) MAKE_STRING_SIGNAL(NV_CTRL_STRING_PRIME_OUTPUTS_DATA); #undef MAKE_STRING_SIGNAL -#if NV_CTRL_STRING_LAST_ATTRIBUTE != NV_CTRL_STRING_PRIME_OUTPUTS_DATA +#if NV_CTRL_STRING_LAST_ATTRIBUTE != NV_CTRL_STRING_DISPLAY_NAME_CONNECTOR #warning "There are attributes that do not emit signals!" #endif diff --git a/src/libXNVCtrl/NVCtrl.h b/src/libXNVCtrl/NVCtrl.h index f7c07d1..939b446 100644 --- a/src/libXNVCtrl/NVCtrl.h +++ b/src/libXNVCtrl/NVCtrl.h @@ -4301,9 +4301,20 @@ */ #define NV_CTRL_STRING_PRIME_OUTPUTS_DATA 55 /* R--- */ +/* + * NV_CTRL_STRING_DISPLAY_NAME_TYPE_CONNECTOR - Returns a name for the display + * device based on the physical connector ("Connector-0", "Connector-1", etc). + * Note that multiple display devices may have the same connector-based name: + * DisplayPort MultiStream devices on the same connector, or display devices + * representing different protocols that can be possibly driven by the same + * connector (e.g., DisplayPort versus TMDS protocols driven over a DisplayPort + * connector). + */ +#define NV_CTRL_STRING_DISPLAY_NAME_CONNECTOR 56 /* R-D- */ + #define NV_CTRL_STRING_LAST_ATTRIBUTE \ - NV_CTRL_STRING_PRIME_OUTPUTS_DATA + NV_CTRL_STRING_DISPLAY_NAME_CONNECTOR /**************************************************************************/ diff --git a/src/libXNVCtrl/version.mk b/src/libXNVCtrl/version.mk index 7ae2f13..7a63ce9 100644 --- a/src/libXNVCtrl/version.mk +++ b/src/libXNVCtrl/version.mk @@ -1 +1 @@ -NVIDIA_VERSION = 440.82 +NVIDIA_VERSION = 440.100 diff --git a/src/libXNVCtrlAttributes/NvCtrlAttributes.h b/src/libXNVCtrlAttributes/NvCtrlAttributes.h index 668510e..ad222a3 100644 --- a/src/libXNVCtrlAttributes/NvCtrlAttributes.h +++ b/src/libXNVCtrlAttributes/NvCtrlAttributes.h @@ -87,6 +87,7 @@ enum { NV_DPY_PROTO_NAME_EDID_HASH, NV_DPY_PROTO_NAME_TARGET_INDEX, NV_DPY_PROTO_NAME_RANDR, + NV_DPY_PROTO_NAME_CONNECTOR, NV_DPY_PROTO_NAME_MAX, }; diff --git a/src/libXNVCtrlAttributes/NvCtrlAttributesUtils.c b/src/libXNVCtrlAttributes/NvCtrlAttributesUtils.c index 73698cc..4207c10 100644 --- a/src/libXNVCtrlAttributes/NvCtrlAttributesUtils.c +++ b/src/libXNVCtrlAttributes/NvCtrlAttributesUtils.c @@ -195,6 +195,9 @@ static void load_display_target_proto_names(CtrlTarget *t) t->protoNames[NV_DPY_PROTO_NAME_RANDR] = query_x_name(t, NV_CTRL_STRING_DISPLAY_NAME_RANDR); + + t->protoNames[NV_DPY_PROTO_NAME_CONNECTOR] = + query_x_name(t, NV_CTRL_STRING_DISPLAY_NAME_CONNECTOR); } @@ -6385,6 +6385,7 @@ nvmlReturn_t DECLDIR nvmlDeviceGetVgpuProcessUtilization(nvmlDevice_t device, un * - \ref NVML_ERROR_INVALID_ARGUMENT if \a vgpuInstance is 0, or \a mode is NULL * - \ref NVML_ERROR_NOT_FOUND if \a vgpuInstance does not match a valid active vGPU instance on the system * - \ref NVML_ERROR_NOT_SUPPORTED if the vGPU doesn't support this feature + * - \ref NVML_ERROR_DRIVER_NOT_LOADED if NVIDIA driver is not running on the vGPU instance * - \ref NVML_ERROR_UNKNOWN on any unexpected error */ nvmlReturn_t DECLDIR nvmlVgpuInstanceGetAccountingMode(nvmlVgpuInstance_t vgpuInstance, nvmlEnableState_t *mode); diff --git a/src/parse.c b/src/parse.c index fb1560e..9d7db3e 100644 --- a/src/parse.c +++ b/src/parse.c @@ -405,7 +405,7 @@ const int attributeTableLen = ARRAY_LEN(attributeTable); #warning "Have you forgotten to add a new integer attribute to attributeTable?" #endif -#if NV_CTRL_STRING_LAST_ATTRIBUTE != NV_CTRL_STRING_PRIME_OUTPUTS_DATA +#if NV_CTRL_STRING_LAST_ATTRIBUTE != NV_CTRL_STRING_DISPLAY_NAME_CONNECTOR #warning "Have you forgotten to add a new string attribute to attributeTable?" #endif diff --git a/src/version.h b/src/version.h index 1da0e4a..7b16bc3 100644 --- a/src/version.h +++ b/src/version.h @@ -1 +1 @@ -#define NVIDIA_VERSION "440.82" +#define NVIDIA_VERSION "440.100" diff --git a/src/version.mk b/src/version.mk index 7ae2f13..7a63ce9 100644 --- a/src/version.mk +++ b/src/version.mk @@ -1 +1 @@ -NVIDIA_VERSION = 440.82 +NVIDIA_VERSION = 440.100 @@ -1 +1 @@ -NVIDIA_VERSION = 440.82 +NVIDIA_VERSION = 440.100 |