File radeontop_PR117.patch of Package radeontop

Overview Repositories Revisions Requests Users Attributes Meta

File radeontop_PR117.patch of Package radeontop (Revision 291ab6b24766cbf73e8632aee546c606)

Currently displaying revision 291ab6b24766cbf73e8632aee546c606 , Show latest

From a4d7c38b3f6813fc50236ed71bbdc6632bcf022d Mon Sep 17 00:00:00 2001
From: Martin Meinhold <martin.meinhold@mmsoft.de>
Date: Fri, 2 Jul 2021 00:29:19 +0200
Subject: [PATCH] GPU temperature sensor data in ui and dump

diff --git a/amdgpu.c b/amdgpu.c
index df2cb40..a631620 100644
--- a/amdgpu.c
+++ b/amdgpu.c
@@ -46,6 +46,11 @@ static int getmclk_amdgpu(uint32_t *out) {
 	return amdgpu_query_sensor_info(amdgpu_dev, AMDGPU_INFO_SENSOR_GFX_MCLK,
 		sizeof(uint32_t), out);
 }
+
+static int gettemp_amdgpu(uint32_t *out) {
+	return amdgpu_query_sensor_info(amdgpu_dev, AMDGPU_INFO_SENSOR_GPU_TEMP,
+		sizeof(uint32_t), out);
+}
 #endif
 
 #define DRM_ATLEAST_VERSION(maj, min) \
@@ -82,6 +87,12 @@ void init_amdgpu(int fd) {
 		else	// memory clock reporting not available on APUs
 			if (!(gpu.ids_flags & AMDGPU_IDS_FLAGS_FUSION))
 				drmError(ret, _("Failed to get memory clock"));
+
+		if (!(ret = gettemp_amdgpu(&out32)))
+			gettemp = gettemp_amdgpu;
+		else
+			drmError(ret, _("Failed to get GPU temperature"));
+
 	} else
 		fprintf(stderr, _("Clock frenquency reporting is disabled (amdgpu kernel driver 3.11.0 required)\n"));
 #else
diff --git a/detect.c b/detect.c
index 94eec65..6a0f233 100644
--- a/detect.c
+++ b/detect.c
@@ -27,6 +27,8 @@ uint64_t vramsize;
 uint64_t gttsize;
 unsigned int sclk_max = 0; // kilohertz
 unsigned int mclk_max = 0; // kilohertz
+unsigned int temp_max = 90; // °C
+
 const void *area;
 
 // function pointers to the right backend
@@ -35,6 +37,7 @@ int (*getvram)(uint64_t *out);
 int (*getgtt)(uint64_t *out);
 int (*getsclk)(uint32_t *out);
 int (*getmclk)(uint32_t *out);
+int (*gettemp)(uint32_t *out);
 
 static int find_pci(short bus, struct pci_device *pci_dev) {
 	int ret = pci_system_init();
@@ -246,7 +249,7 @@ static int getuint64_null(uint64_t *out) { UNUSED(out); return -1; }
 void init_pci(const char *path, short *bus, unsigned int *device_id, const unsigned char forcemem) {
 	short device_bus = -1;
 	int err = 1;
-	getgrbm = getsclk = getmclk = getuint32_null;
+	getgrbm = getsclk = getmclk = gettemp = getuint32_null;
 	getvram = getgtt = getuint64_null;
 
 	if (path) {
diff --git a/dump.c b/dump.c
index df41104..8ed7db2 100644
--- a/dump.c
+++ b/dump.c
@@ -104,6 +104,8 @@ void dumpdata(const unsigned int ticks, const char file[], const unsigned int li
 		float sclk = 100.0f * (results->sclk * k) / (sclk_max / 1e3f);
 		float mclk_ghz = results->mclk * k / 1000.0f;
 		float sclk_ghz = results->sclk * k / 1000.0f;
+        float temp_c = results->temp / 100000.0f;
+        float temp = 100.0f / temp_max * temp_c;
 
 		fprintf(f, "gpu %.2f%%, ", gui);
 		fprintf(f, "ee %.2f%%, ", ee);
@@ -138,6 +140,9 @@ void dumpdata(const unsigned int ticks, const char file[], const unsigned int li
 			fprintf(f, ", mclk %.2f%% %.3fghz, sclk %.2f%% %.3fghz",
 					mclk, mclk_ghz, sclk, sclk_ghz);
 
+		if (gettemp != NULL && temp > 0)
+			fprintf(f, ", temp %.2f%% %.1fC", temp, temp_c);
+
 		fprintf(f, "\n");
 		fflush(f);
 
diff --git a/include/radeontop.h b/include/radeontop.h
index 0500e2f..fbad42a 100644
--- a/include/radeontop.h
+++ b/include/radeontop.h
@@ -57,6 +57,7 @@ extern int (*getvram)(uint64_t *out);
 extern int (*getgtt)(uint64_t *out);
 extern int (*getsclk)(uint32_t *out);
 extern int (*getmclk)(uint32_t *out);
+extern int (*gettemp)(uint32_t *out);
 
 // ticks.c
 void collect(unsigned int ticks, unsigned int dumpinterval);
@@ -150,6 +151,7 @@ struct bits_t {
 	uint64_t gtt;
 	unsigned int sclk;
 	unsigned int mclk;
+	unsigned int temp;
 };
 
 extern struct bits_t bits;
@@ -157,6 +159,7 @@ extern uint64_t vramsize;
 extern uint64_t gttsize;
 extern unsigned int sclk_max;
 extern unsigned int mclk_max;
+extern unsigned int temp_max;
 
 // radeon.c
 void init_radeon(int fd, int drm_major, int drm_minor);
diff --git a/radeon.c b/radeon.c
index 3beaf8b..af9ef03 100644
--- a/radeon.c
+++ b/radeon.c
@@ -57,6 +57,10 @@ static int getsclk_radeon(uint32_t *out) {
 static int getmclk_radeon(uint32_t *out) {
 	return radeon_get_drm_value(drm_fd, RADEON_INFO_CURRENT_GPU_MCLK, out);
 }
+
+static int gettemp_radeon(uint32_t *out) {
+    return radeon_get_drm_value(drm_fd, RADEON_INFO_CURRENT_GPU_TEMP, out);
+}
 #endif
 
 #ifdef RADEON_INFO_VRAM_USAGE
@@ -103,6 +107,12 @@ void init_radeon(int fd, int drm_major, int drm_minor) {
 			getmclk = getmclk_radeon;
 		else
 			drmError(ret, _("Failed to get memory clock"));
+
+		if (!(ret = gettemp_radeon(&out32)))
+			gettemp = gettemp_radeon;
+		else
+			drmError(ret, _("Failed to get GPU temparature"));
+
 	} else
 		fprintf(stderr, _("GPU usage reporting via libdrm is disabled (radeon kernel driver 2.42.0 required), attempting memory path\n"));
 #else
diff --git a/ticks.c b/ticks.c
index 4b965f3..56bc565 100644
--- a/ticks.c
+++ b/ticks.c
@@ -40,6 +40,8 @@ static void *collector(void *arg) {
 
 	while (1) {
 		unsigned int stat;
+
+		// safe call: initialized in detect.c -> init_pci
 		getgrbm(&stat);
 
 		memset(&history[cur], 0, sizeof(struct bits_t));
@@ -58,8 +60,11 @@ static void *collector(void *arg) {
 		if (stat & bits.db) history[cur].db = 1;
 		if (stat & bits.cr) history[cur].cr = 1;
 		if (stat & bits.cb) history[cur].cb = 1;
+
+		// safe call: initialized in detect.c -> init_pci
 		getsclk(&history[cur].sclk);
 		getmclk(&history[cur].mclk);
+		gettemp(&history[cur].temp);
 
 		usleep(sleeptime);
 		cur++;
@@ -88,8 +93,10 @@ static void *collector(void *arg) {
 				res[curres].cr += history[i].cr;
 				res[curres].mclk += history[i].mclk;
 				res[curres].sclk += history[i].sclk;
+				res[curres].temp += history[i].temp;
 			}
 
+			// safe call: initialized in detect.c -> init_pci
 			getvram(&res[curres].vram);
 			getgtt(&res[curres].gtt);
 
diff --git a/ui.c b/ui.c
index dcbfeef..e445ea4 100644
--- a/ui.c
+++ b/ui.c
@@ -160,6 +160,8 @@ void present(const unsigned int ticks, const char card[], unsigned int color,
 		float sclk = 100.0f * (results->sclk * k) / (sclk_max / 1e3f);
 		float mclk_ghz = results->mclk * k / 1000.0f;
 		float sclk_ghz = results->sclk * k / 1000.0f;
+		float temp_c = results->temp / 100000.0f;
+		float temp = 100.0f / temp_max * temp_c;
 
 		mvhline(3, 0, ACS_HLINE, w);
 		mvvline(1, (w/2) + 1, ACS_VLINE, h);
@@ -275,6 +277,17 @@ void present(const unsigned int ticks, const char card[], unsigned int color,
 			if (color) attroff(COLOR_PAIR(3));
 		}
 
+		if (gettemp != NULL && temp > 0) {
+			// Enough height?
+			if (h > bigh) start++;
+
+			if (color) attron(COLOR_PAIR(5));
+
+			percentage(start, w, temp_c);
+			printright(start++, hw, _("%.1fC GPU Temperature %6.2f%%"),
+				temp_c, temp);
+		}
+
 		//move the cursor away to fix some resizing artifacts on some terminals
 		move(0,0);

Places

File radeontop_PR117.patch of Package radeontop (Revision 291ab6b24766cbf73e8632aee546c606)

Places