Browse Source

Merge commit '274bf69' into cg_merges_20130606a

Luke Dashjr 12 years ago
parent
commit
5badbbc382
1 changed files with 8 additions and 2 deletions
  1. 8 2
      adl.c

+ 8 - 2
adl.c

@@ -501,9 +501,15 @@ void init_adl(int nDevs)
 		if (!gpus[gpu].cutofftemp)
 		if (!gpus[gpu].cutofftemp)
 			gpus[gpu].cutofftemp = opt_cutofftemp;
 			gpus[gpu].cutofftemp = opt_cutofftemp;
 		if (opt_autofan) {
 		if (opt_autofan) {
-			ga->autofan = true;
 			/* Set a safe starting default if we're automanaging fan speeds */
 			/* Set a safe starting default if we're automanaging fan speeds */
-			set_fanspeed(gpu, 50);
+			int nominal = 50;
+
+			ga->autofan = true;
+			/* Clamp fanspeed values to range provided */
+			if (nominal > gpus[gpu].gpu_fan)
+				nominal = gpus[gpu].gpu_fan;
+			if (nominal < gpus[gpu].min_fan)
+				nominal = gpus[gpu].min_fan;
 		}
 		}
 		if (opt_autoengine) {
 		if (opt_autoengine) {
 			ga->autoengine = true;
 			ga->autoengine = true;