Commit 67fe6ab7265fdad18f8f7a9e38262643e53d1556
2011-09-16T10:26:25
Don't both with adapter speed set as it has no effect on mining speed.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75
diff --git a/adl.c b/adl.c
index b23a8fd..d1f9804 100644
--- a/adl.c
+++ b/adl.c
@@ -68,8 +68,6 @@ static ADL_OVERDRIVE5_ODPERFORMANCELEVELS_SET ADL_Overdrive5_ODPerformanceLevels
static ADL_MAIN_CONTROL_REFRESH ADL_Main_Control_Refresh;
static ADL_OVERDRIVE5_POWERCONTROL_GET ADL_Overdrive5_PowerControl_Get;
static ADL_OVERDRIVE5_POWERCONTROL_SET ADL_Overdrive5_PowerControl_Set;
-static ADL_ADAPTER_SPEED_GET ADL_Adapter_Speed_Get;
-static ADL_ADAPTER_SPEED_SET ADL_Adapter_Speed_Set;
static ADL_OVERDRIVE5_FANSPEEDTODEFAULT_SET ADL_Overdrive5_FanSpeedToDefault_Set;
#if defined (LINUX)
@@ -131,8 +129,6 @@ void init_adl(int nDevs)
ADL_Main_Control_Refresh = (ADL_MAIN_CONTROL_REFRESH) GetProcAddress(hDLL, "ADL_Main_Control_Refresh");
ADL_Overdrive5_PowerControl_Get = (ADL_OVERDRIVE5_POWERCONTROL_GET) GetProcAddress(hDLL, "ADL_Overdrive5_PowerControl_Get");
ADL_Overdrive5_PowerControl_Set = (ADL_OVERDRIVE5_POWERCONTROL_SET) GetProcAddress(hDLL, "ADL_Overdrive5_PowerControl_Set");
- ADL_Adapter_Speed_Get = (ADL_ADAPTER_SPEED_GET) GetProcAddress(hDLL, "ADL_Adapter_Speed_Get");
- ADL_Adapter_Speed_Set = (ADL_ADAPTER_SPEED_SET) GetProcAddress(hDLL, "ADL_Adapter_Speed_Set");
ADL_Overdrive5_FanSpeedToDefault_Set = (ADL_OVERDRIVE5_FANSPEEDTODEFAULT_SET) GetProcAddress(hDLL, "ADL_Overdrive5_FanSpeedToDefault_Set");
if (!ADL_Main_Control_Create || !ADL_Main_Control_Destroy ||
@@ -143,8 +139,7 @@ void init_adl(int nDevs)
!ADL_Overdrive5_FanSpeed_Get || !ADL_Overdrive5_FanSpeed_Set ||
!ADL_Overdrive5_ODPerformanceLevels_Get || !ADL_Overdrive5_ODPerformanceLevels_Set ||
!ADL_Main_Control_Refresh || !ADL_Overdrive5_PowerControl_Get ||
- !ADL_Overdrive5_PowerControl_Set || !ADL_Adapter_Speed_Get ||
- !ADL_Adapter_Speed_Set || !ADL_Overdrive5_FanSpeedToDefault_Set) {
+ !ADL_Overdrive5_PowerControl_Set || !ADL_Overdrive5_FanSpeedToDefault_Set) {
applog(LOG_WARNING, "ATI ADL's API is missing");
return;
}
@@ -226,10 +221,6 @@ void init_adl(int nDevs)
ga->lpAdapterID = lpAdapterID;
ga->DefPerfLev = NULL;
- /* Save whatever the current speed setting is to restore on exit */
- if (ADL_Adapter_Speed_Get(iAdapterIndex, &ga->lpCurrent, &dummy) != ADL_OK)
- applog(LOG_INFO, "Failed to ADL_Adapter_Speed_Get");
-
if (ADL_Overdrive5_ODParameters_Get(iAdapterIndex, &ga->lpOdParameters) != ADL_OK)
applog(LOG_INFO, "Failed to ADL_Overdrive5_ODParameters_Get");
@@ -330,11 +321,6 @@ void init_adl(int nDevs)
ga->autoengine = true;
ga->managed = true;
}
-
- if (ga->managed) {
- if (ADL_Adapter_Speed_Set(iAdapterIndex, ADL_CONTEXT_SPEED_FORCEHIGH) != ADL_OK)
- applog(LOG_INFO, "Failed to ADL_Adapter_Speed_Set");
- }
}
}
@@ -1120,7 +1106,6 @@ void clear_adl(nDevs)
/* Only reset the values if we've changed them at any time */
if (!gpus[i].has_adl || !ga->managed)
continue;
- ADL_Adapter_Speed_Set(ga->iAdapterIndex, ga->lpCurrent);
ADL_Overdrive5_ODPerformanceLevels_Set(ga->iAdapterIndex, ga->DefPerfLev);
free(ga->DefPerfLev);
ADL_Overdrive5_FanSpeed_Set(ga->iAdapterIndex, 0, &ga->DefFanSpeedValue);
diff --git a/miner.h b/miner.h
index d272cb2..12138c3 100644
--- a/miner.h
+++ b/miner.h
@@ -173,7 +173,6 @@ struct gpu_adl {
int iMemoryClock;
int iVddc;
int iPercentage;
- int lpCurrent;
bool autofan;
bool autoengine;