gpu-engine and gpu-memclock exit values are now applied when disabling a device.

This goes for both the ncurses interface and through the API.

Author: Kalroth

adl.c

@@ -1485,38 +1485,53 @@ static void free_adl(void)
 #endif
 }
 
-void clear_adl(int nDevs)
+void adl_reset_device(int device_id, bool _disabling, bool _freeing)
 {
 	struct gpu_adl *ga;
-	int i;
 
 	if (!adl_active)
 		return;
 
 	lock_adl();
-	/* Try to reset values to their defaults */
-	for (i = 0; i < nDevs; i++) {
-		ga = &gpus[i].adl;
-		/*  Only reset the values if we've changed them at any time */
-		if (!gpus[i].has_adl || !ga->managed)
-			continue;
-
+	ga = &gpus[device_id].adl;
+	// Only reset the values if we've changed them at any time
+	if (gpus[device_id].has_adl && ga->managed)
+	{
 		int lev;
 		lev = ga->lpOdParameters.iNumberOfPerformanceLevels - 1;
 
-		/* Set exit values of the GPU */
-		if (gpus[i].gpu_engine_exit)
-			ga->DefPerfLev->aLevels[lev].iEngineClock = gpus[i].gpu_engine_exit * 100; 
-		if (gpus[i].gpu_memclock_exit)
-			ga->DefPerfLev->aLevels[lev].iMemoryClock = gpus[i].gpu_memclock_exit * 100;
-
+		ga->DefPerfLev->aLevels[lev].iEngineClock = gpus[device_id].gpu_engine * 100; 
+		ga->DefPerfLev->aLevels[lev].iMemoryClock = gpus[device_id].gpu_memclock * 100;
+		if (_disabling) // Set exit/disable values of the GPU
+		{
+			if (gpus[device_id].gpu_engine_exit)
+				ga->DefPerfLev->aLevels[lev].iEngineClock = gpus[device_id].gpu_engine_exit * 100; 
+			if (gpus[device_id].gpu_memclock_exit)
+				ga->DefPerfLev->aLevels[lev].iMemoryClock = gpus[device_id].gpu_memclock_exit * 100;
+		}
 		ADL_Overdrive5_ODPerformanceLevels_Set(ga->iAdapterIndex, ga->DefPerfLev);
-		free(ga->DefPerfLev);
-		ADL_Overdrive5_FanSpeed_Set(ga->iAdapterIndex, 0, &ga->DefFanSpeedValue);
-		ADL_Overdrive5_FanSpeedToDefault_Set(ga->iAdapterIndex, 0);
+
+		if (_freeing) {
+			free(ga->DefPerfLev);
+			ADL_Overdrive5_FanSpeed_Set(ga->iAdapterIndex, 0, &ga->DefFanSpeedValue);
+			ADL_Overdrive5_FanSpeedToDefault_Set(ga->iAdapterIndex, 0); 		
+		}
 	}
-	adl_active = false;
 	unlock_adl();
+}
+
+void clear_adl(int nDevs)
+{
+	int i;
+
+	if (!adl_active)
+		return;
+
+	for (i = 0; i < nDevs; i++) {
+		adl_reset_device(i, true, true);
+	}
+
+	adl_active = false;
 	free_adl();
 }
 #endif /* HAVE_ADL */

adl.h

@@ -18,6 +18,7 @@ bool gpu_stats(int gpu, float *temp, int *engineclock, int *memclock, float *vdd
 	       int *activity, int *fanspeed, int *fanpercent, int *powertune);
 void change_gpusettings(int gpu);
 void gpu_autotune(int gpu, enum dev_enable *denable);
+void adl_reset_device(int device_id, bool _disabling, bool _freeing);
 void clear_adl(int nDevs);
 #else /* HAVE_ADL */
 #define adl_active (0)

api.c

@@ -2690,6 +2690,9 @@ static void gpuenable(struct io_data *io_data, __maybe_unused SOCKETTYPE c, char
 				return;
 			}
 			gpus[id].deven = DEV_ENABLED;
+#ifdef HAVE_ADL
+			adl_reset_device(id, false, false);
+#endif
 			applog(LOG_DEBUG, "API Pushing sem post to thread %d", thr->id);
 			cgsem_post(&thr->sem);
 		}
@@ -2727,6 +2730,9 @@ static void gpudisable(struct io_data *io_data, __maybe_unused SOCKETTYPE c, cha
 	}
 
 	gpus[id].deven = DEV_DISABLED;
+#ifdef HAVE_ADL
+	adl_reset_device(id, true, false);
+#endif
 
 	message(io_data, MSG_GPUDIS, id, NULL, isjson);
 }

driver-opencl.c

@@ -887,6 +887,9 @@ void manage_gpu(void)
 			goto retry;
 		}
 		gpus[selected].deven = DEV_ENABLED;
+#ifdef HAVE_ADL
+	adl_reset_device(selected, false, false);
+#endif
 		for (i = 0; i < mining_threads; ++i) {
 			thr = get_thread(i);
 			cgpu = thr->cgpu;
@@ -915,6 +918,9 @@ void manage_gpu(void)
 			goto retry;
 		}
 		gpus[selected].deven = DEV_DISABLED;
+#ifdef HAVE_ADL 
+	adl_reset_device(selected, true, false);
+#endif
 		goto retry;
 	} else if (!strncasecmp(&input, "i", 1)) {
 		int intensity;