Commit b8be1e6c1593f4a96ba62d52c94a6e69bddaee40
2011-09-07T09:17:51
Ignore whether the display is active or not since only display enabled devices work this way, and we skip over repeat entries anwyay.
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 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112
diff --git a/adl.c b/adl.c
index 42044c3..a73dba4 100644
--- a/adl.c
+++ b/adl.c
@@ -57,7 +57,6 @@ static ADL_ADAPTER_NUMBEROFADAPTERS_GET ADL_Adapter_NumberOfAdapters_Get;
static ADL_ADAPTER_ADAPTERINFO_GET ADL_Adapter_AdapterInfo_Get;
static ADL_ADAPTER_ID_GET ADL_Adapter_ID_Get;
static ADL_OVERDRIVE5_TEMPERATURE_GET ADL_Overdrive5_Temperature_Get;
-static ADL_ADAPTER_ACTIVE_GET ADL_Adapter_Active_Get;
static ADL_OVERDRIVE5_CURRENTACTIVITY_GET ADL_Overdrive5_CurrentActivity_Get;
static ADL_OVERDRIVE5_ODPARAMETERS_GET ADL_Overdrive5_ODParameters_Get;
static ADL_OVERDRIVE5_FANSPEEDINFO_GET ADL_Overdrive5_FanSpeedInfo_Get;
@@ -120,7 +119,6 @@ void init_adl(int nDevs)
ADL_Adapter_AdapterInfo_Get = (ADL_ADAPTER_ADAPTERINFO_GET) GetProcAddress(hDLL,"ADL_Adapter_AdapterInfo_Get");
ADL_Adapter_ID_Get = (ADL_ADAPTER_ID_GET) GetProcAddress(hDLL,"ADL_Adapter_ID_Get");
ADL_Overdrive5_Temperature_Get = (ADL_OVERDRIVE5_TEMPERATURE_GET) GetProcAddress(hDLL,"ADL_Overdrive5_Temperature_Get");
- ADL_Adapter_Active_Get = (ADL_ADAPTER_ACTIVE_GET) GetProcAddress(hDLL, "ADL_Adapter_Active_Get");
ADL_Overdrive5_CurrentActivity_Get = (ADL_OVERDRIVE5_CURRENTACTIVITY_GET) GetProcAddress(hDLL, "ADL_Overdrive5_CurrentActivity_Get");
ADL_Overdrive5_ODParameters_Get = (ADL_OVERDRIVE5_ODPARAMETERS_GET) GetProcAddress(hDLL, "ADL_Overdrive5_ODParameters_Get");
ADL_Overdrive5_FanSpeedInfo_Get = (ADL_OVERDRIVE5_FANSPEEDINFO_GET) GetProcAddress(hDLL, "ADL_Overdrive5_FanSpeedInfo_Get");
@@ -137,7 +135,7 @@ void init_adl(int nDevs)
if (!ADL_Main_Control_Create || !ADL_Main_Control_Destroy ||
!ADL_Adapter_NumberOfAdapters_Get || !ADL_Adapter_AdapterInfo_Get ||
!ADL_Adapter_ID_Get || !ADL_Overdrive5_Temperature_Get ||
- !ADL_Adapter_Active_Get || !ADL_Overdrive5_CurrentActivity_Get ||
+ !ADL_Overdrive5_CurrentActivity_Get ||
!ADL_Overdrive5_ODParameters_Get || !ADL_Overdrive5_FanSpeedInfo_Get ||
!ADL_Overdrive5_FanSpeed_Get || !ADL_Overdrive5_FanSpeed_Set ||
!ADL_Overdrive5_ODPerformanceLevels_Get || !ADL_Overdrive5_ODPerformanceLevels_Set ||
@@ -189,7 +187,7 @@ void init_adl(int nDevs)
int lev;
iAdapterIndex = lpInfo[i].iAdapterIndex;
- /* Get unique identifier of the adapter */
+ /* Get unique identifier of the adapter, 0 means not AMD */
if (ADL_Adapter_ID_Get(iAdapterIndex, &lpAdapterID) != ADL_OK) {
applog(LOG_INFO, "Failed to ADL_Adapter_ID_Get");
continue;
@@ -197,33 +195,26 @@ void init_adl(int nDevs)
if (!lpAdapterID)
continue;
- if (lpAdapterID != last_adapter) {
- /* We found a truly new adapter instead of a logical
- * one. Now since there's no way of correlating the
- * opencl enumerated devices and the ADL enumerated
- * ones, we have to assume they're in the same order.*/
- if (++devices > nDevs) {
- applog(LOG_ERR, "ADL found more devices than opencl");
- return;
- }
- gpu = devices - 1;
- last_adapter = lpAdapterID;
- }
-
- /* See if the adapter is an AMD device with ADL active */
- if (ADL_Adapter_Active_Get(iAdapterIndex, &lpStatus) != ADL_OK) {
- applog(LOG_INFO, "Failed to ADL_Adapter_Active_Get");
+ /* Each adapter may have multiple entries */
+ if (lpAdapterID == last_adapter)
continue;
+
+ /* We found a truly new adapter instead of a logical
+ * one. Now since there's no way of correlating the
+ * opencl enumerated devices and the ADL enumerated
+ * ones, we have to assume they're in the same order.*/
+ if (++devices > nDevs) {
+ applog(LOG_ERR, "ADL found more devices than opencl");
+ return;
}
- if (!lpStatus)
- continue;
+ gpu = devices - 1;
+ last_adapter = lpAdapterID;
/* From here on we know this device is a discrete device and
* should support ADL */
ga = &gpus[gpu].adl;
ga->iAdapterIndex = iAdapterIndex;
ga->lpAdapterID = lpAdapterID;
- ga->lpStatus = lpStatus;
ga->DefPerfLev = NULL;
/* Save whatever the current speed setting is to restore on exit */
diff --git a/miner.h b/miner.h
index 113c36f..a1d99f0 100644
--- a/miner.h
+++ b/miner.h
@@ -160,13 +160,14 @@ struct gpu_adl {
ADLTemperature lpTemperature;
int iAdapterIndex;
int lpAdapterID;
- int lpStatus;
+
ADLPMActivity lpActivity;
ADLODParameters lpOdParameters;
ADLODPerformanceLevels *DefPerfLev;
ADLFanSpeedInfo lpFanSpeedInfo;
ADLFanSpeedValue lpFanSpeedValue;
ADLFanSpeedValue DefFanSpeedValue;
+
int iEngineClock;
int iMemoryClock;
int iVddc;
@@ -175,6 +176,7 @@ struct gpu_adl {
bool autofan;
bool autoengine;
+
int targettemp;
int overtemp;
int minspeed;