- ss = sensors;
- for (i = 0; i < n; i++) {
- add(&ss,
- i,
- SENSOR_TYPE_GPU | SENSOR_TYPE_GPU | SENSOR_TYPE_TEMP,
- values_len);
-
- add(&ss,
- i,
- SENSOR_TYPE_GPU | SENSOR_TYPE_USAGE | SENSOR_TYPE_AMBIENT,
- values_len);
-
- add(&ss,
- i,
- SENSOR_TYPE_GPU | SENSOR_TYPE_USAGE | SENSOR_TYPE_GRAPHICS,
- values_len);
-
- add(&ss,
- i,
- SENSOR_TYPE_GPU | SENSOR_TYPE_USAGE | SENSOR_TYPE_VIDEO,
- values_len);
-
- add(&ss,
- i,
- SENSOR_TYPE_GPU | SENSOR_TYPE_USAGE | SENSOR_TYPE_MEMORY,
- values_len);
-
- add(&ss,
- i,
- SENSOR_TYPE_GPU | SENSOR_TYPE_USAGE | SENSOR_TYPE_PCIE,
- values_len);
+ ret = XNVCTRLQueryTargetCount(display, NV_CTRL_TARGET_TYPE_GPU, &n);
+ if (ret == True) {
+ for (i = 0; i < n; i++) {
+ add(&ss,
+ i,
+ SENSOR_TYPE_GPU | SENSOR_TYPE_TEMP,
+ values_len);
+
+ utype = SENSOR_TYPE_GPU | SENSOR_TYPE_USAGE;
+
+ add(&ss, i, utype | SENSOR_TYPE_AMBIENT, values_len);
+
+ add(&ss, i, utype | SENSOR_TYPE_GRAPHICS, values_len);
+
+ add(&ss, i, utype | SENSOR_TYPE_VIDEO, values_len);
+
+ add(&ss, i, utype | SENSOR_TYPE_MEMORY, values_len);
+
+ add(&ss, i, utype | SENSOR_TYPE_PCIE, values_len);
+ }
+ }
+
+ ret = XNVCTRLQueryTargetCount(display, NV_CTRL_TARGET_TYPE_COOLER, &n);
+ if (ret == True) {
+ log_debug("NVIDIA: number of fans: %d", n);
+ for (i = 0; i < n; i++) {
+ ret = XNVCTRLQueryTargetAttribute
+ (display,
+ NV_CTRL_TARGET_TYPE_COOLER,
+ i,
+ 0,
+ NV_CTRL_THERMAL_COOLER_SPEED, &rpm);
+ if (ret == True)
+ log_debug("NVIDIA: fan speed %d %d", i, rpm);
+ else
+ log_err("NVIDIA: fail to retrieve fan speed %d",
+ i);
+ }
+ } else {
+ log_err(_("Failed to retrieve number of NVIDIA fans."));