IntenseWebs/tuxclocker
3
0
Fork 0
mirror of https://github.com/Lurkki14/tuxclocker.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

don't call XNVCtrl functions when X Display is null

Browse Source 
aka XOpenDisplay returns null
This commit is contained in:
Jussi Kuokkanen 2023-10-22 17:40:26 +03:00
parent d8d82604ba
commit 5bebd76b1a
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/Nvidia.cpp
View File

@ -50,7 +50,10 @@ std::optional<AssignmentError> fromNVMLRet(nvmlReturn_t ret) {
return AssignmentError::UnknownError;
}
uint nvctrlPerfModes(Display *dpy, uint index) {
std::optional<uint> nvctrlPerfModes(Display *dpy, uint index) {
if (!dpy)
return std::nullopt;
// TODO: NVML has a function to get these but is borked
// Thanks to Artifth for original code
char *result;
@ -545,6 +548,9 @@ std::vector<TreeNode<DeviceNode>> getShutdownTemperature(NvidiaGPUData data) {
}
std::vector<TreeNode<DeviceNode>> getVoltage(NvidiaGPUData data) {
if (!data.dpy)
return {};
auto func = [data]() -> ReadResult {
int value;
if (!XNVCTRLQueryTargetAttribute(data.dpy, NV_CTRL_TARGET_TYPE_GPU, data.index, 0,
@ -565,6 +571,9 @@ std::vector<TreeNode<DeviceNode>> getVoltage(NvidiaGPUData data) {
}
std::vector<TreeNode<DeviceNode>> getVoltageOffset(NvidiaGPUData data) {
if (!data.dpy)
return {};
NVCTRLAttributeValidValuesRec values;
if (!XNVCTRLQueryValidTargetAttributeValues(data.dpy, NV_CTRL_TARGET_TYPE_GPU, data.index,
0, NV_CTRL_GPU_OVER_VOLTAGE_OFFSET, &values))
@ -724,7 +733,8 @@ NvidiaPlugin::~NvidiaPlugin() {
XCloseDisplay(m_dpy);
}
NvidiaPlugin::NvidiaPlugin() : m_dpy() {
NvidiaPlugin::NvidiaPlugin() {
m_dpy = nullptr;
// NOTE: we don't seem to need to do any locale stuff here,
// since the daemon does and loads us
if (nvmlInit_v2() != NVML_SUCCESS)