GOSTSec/sgminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/sgminer synced 2025-01-25 14:04:25 +00:00
Code Issues Releases Wiki Activity

If the user defined flag is not set on fanspeed, set the fanspeed with it first.

Browse Source
This commit is contained in:
Con Kolivas 2011-09-15 12:18:30 +10:00
parent 8e2becc12d
commit 3f10e80a93
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
adl.c
View File

@ -299,15 +299,9 @@ void init_adl(int nDevs)
/* Save the fanspeed values as defaults in case we reset later */ /* Save the fanspeed values as defaults in case we reset later */
ADL_Overdrive5_FanSpeed_Get(ga->iAdapterIndex, 0, &ga->DefFanSpeedValue); ADL_Overdrive5_FanSpeed_Get(ga->iAdapterIndex, 0, &ga->DefFanSpeedValue);
if (gpus[gpu].gpu_fan) { if (gpus[gpu].gpu_fan)
ADL_Overdrive5_FanSpeed_Get(ga->iAdapterIndex, 0, &ga->lpFanSpeedValue); set_fanspeed(gpu, gpus[gpu].gpu_fan);
ga->targetfan = ga->lpFanSpeedValue.iFanSpeed = gpus[gpu].gpu_fan; else
ga->lpFanSpeedValue.iFlags = ADL_DL_FANCTRL_FLAG_USER_DEFINED_SPEED;
ga->lpFanSpeedValue.iSpeedType = ADL_DL_FANCTRL_SPEED_TYPE_PERCENT;
applog(LOG_INFO, "Setting GPU %d fan speed to %d%%", gpu, gpus[gpu].gpu_fan);
ADL_Overdrive5_FanSpeed_Set(ga->iAdapterIndex, 0, &ga->lpFanSpeedValue);
ga->managed = true;
} else
gpus[gpu].gpu_fan = 85; /* Set a nominal upper limit of 85% */ gpus[gpu].gpu_fan = 85; /* Set a nominal upper limit of 85% */
/* Not fatal if powercontrol get fails */ /* Not fatal if powercontrol get fails */
@ -331,7 +325,6 @@ void init_adl(int nDevs)
ga->autofan = true; 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, gpus[gpu].gpu_fan); set_fanspeed(gpu, gpus[gpu].gpu_fan);
ga->managed = true;
} }
if (opt_autoengine) { if (opt_autoengine) {
ga->autoengine = true; ga->autoengine = true;
@ -771,13 +764,17 @@ static int set_fanspeed(int gpu, int iFanSpeed)
/* Store what fanspeed we're actually aiming for for re-entrant changes /* Store what fanspeed we're actually aiming for for re-entrant changes
* in case this device does not support fine setting changes */ * in case this device does not support fine setting changes */
ga->targetfan = iFanSpeed; ga->targetfan = iFanSpeed;
ga->lpFanSpeedValue.iFlags = ADL_DL_FANCTRL_FLAG_USER_DEFINED_SPEED;
if (!(ga->lpFanSpeedInfo.iFlags & ADL_DL_FANCTRL_SUPPORTS_PERCENT_WRITE)) { if (!(ga->lpFanSpeedInfo.iFlags & ADL_DL_FANCTRL_SUPPORTS_PERCENT_WRITE)) {
/* Must convert speed to an RPM */ /* Must convert speed to an RPM */
iFanSpeed = ga->lpFanSpeedInfo.iMaxRPM * iFanSpeed / 100; iFanSpeed = ga->lpFanSpeedInfo.iMaxRPM * iFanSpeed / 100;
ga->lpFanSpeedValue.iSpeedType = ADL_DL_FANCTRL_SPEED_TYPE_RPM; ga->lpFanSpeedValue.iSpeedType = ADL_DL_FANCTRL_SPEED_TYPE_RPM;
} else } else
ga->lpFanSpeedValue.iSpeedType = ADL_DL_FANCTRL_SPEED_TYPE_PERCENT; ga->lpFanSpeedValue.iSpeedType = ADL_DL_FANCTRL_SPEED_TYPE_PERCENT;
if (!(ga->lpFanSpeedValue.iFlags & ADL_DL_FANCTRL_FLAG_USER_DEFINED_SPEED)) {
/* If user defined is not already specified, set it first */
ga->lpFanSpeedValue.iFlags = ADL_DL_FANCTRL_FLAG_USER_DEFINED_SPEED;
ADL_Overdrive5_FanSpeed_Set(ga->iAdapterIndex, 0, &ga->lpFanSpeedValue);
}
ga->lpFanSpeedValue.iFanSpeed = iFanSpeed; ga->lpFanSpeedValue.iFanSpeed = iFanSpeed;
if (ADL_Overdrive5_FanSpeed_Set(ga->iAdapterIndex, 0, &ga->lpFanSpeedValue) == ADL_OK) if (ADL_Overdrive5_FanSpeed_Set(ga->iAdapterIndex, 0, &ga->lpFanSpeedValue) == ADL_OK)
ret = 0; ret = 0;