Commit 9f618f4a973f26ce44ad1969ff54c645652f0bf0
2011-09-05T17:14:09
Lower profile settings cannot be higher than higher profile ones so link any drops in settings.
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 113 114 115
diff --git a/adl.c b/adl.c
index e61990d..9e3a794 100644
--- a/adl.c
+++ b/adl.c
@@ -92,7 +92,7 @@ static inline void unlock_adl(void)
void init_adl(int nDevs)
{
- int i, devices = 0, last_adapter = -1, gpu = 0, dummy = 0;
+ int i, j, devices = 0, last_adapter = -1, gpu = 0, dummy = 0;
#if defined (LINUX)
hDLL = dlopen( "libatiadlxx.so", RTLD_LAZY|RTLD_GLOBAL);
@@ -258,17 +258,36 @@ void init_adl(int nDevs)
ga->DefPerfLev = lpOdPerformanceLevels;
if (gpus[gpu].gpu_engine) {
- lpOdPerformanceLevels->aLevels[lev].iEngineClock = gpus[gpu].gpu_engine * 100;
+ int setengine = gpus[gpu].gpu_engine * 100;
+
+ /* Lower profiles can't have a higher setting */
+ for (j = 0; j < lev; j++) {
+ if (lpOdPerformanceLevels->aLevels[j].iEngineClock > setengine)
+ lpOdPerformanceLevels->aLevels[j].iEngineClock = setengine;
+ }
+ lpOdPerformanceLevels->aLevels[lev].iEngineClock = setengine;
applog(LOG_INFO, "Setting GPU %d engine clock to %d", gpu, gpus[gpu].gpu_engine);
ADL_Overdrive5_ODPerformanceLevels_Set(iAdapterIndex, lpOdPerformanceLevels);
}
if (gpus[gpu].gpu_memclock) {
- lpOdPerformanceLevels->aLevels[lev].iMemoryClock = gpus[gpu].gpu_memclock * 100;
+ int setmem = gpus[gpu].gpu_memclock * 100;
+
+ for (j = 0; j < lev; j++) {
+ if (lpOdPerformanceLevels->aLevels[j].iMemoryClock > setmem)
+ lpOdPerformanceLevels->aLevels[j].iMemoryClock = setmem;
+ }
+ lpOdPerformanceLevels->aLevels[lev].iMemoryClock = setmem;
applog(LOG_INFO, "Setting GPU %d memory clock to %d", gpu, gpus[gpu].gpu_memclock);
ADL_Overdrive5_ODPerformanceLevels_Set(iAdapterIndex, lpOdPerformanceLevels);
}
if (gpus[gpu].gpu_vddc) {
- lpOdPerformanceLevels->aLevels[lev].iVddc = gpus[gpu].gpu_vddc * 1000;
+ int setv = gpus[gpu].gpu_vddc * 1000;
+
+ for (j = 0; j < lev; j++) {
+ if (lpOdPerformanceLevels->aLevels[j].iVddc > setv)
+ lpOdPerformanceLevels->aLevels[j].iVddc = setv;
+ }
+ lpOdPerformanceLevels->aLevels[lev].iVddc = setv;
applog(LOG_INFO, "Setting GPU %d voltage to %.3f", gpu, gpus[gpu].gpu_vddc);
ADL_Overdrive5_ODPerformanceLevels_Set(iAdapterIndex, lpOdPerformanceLevels);
}
@@ -562,8 +581,8 @@ static void get_enginerange(int gpu, int *imin, int *imax)
static int set_engineclock(int gpu, int iEngineClock)
{
ADLODPerformanceLevels *lpOdPerformanceLevels;
+ int i, lev, ret = 1;
struct gpu_adl *ga;
- int lev, ret = 1;
if (!gpus[gpu].has_adl || !adl_active) {
wlogprint("Set engineclock not supported\n");
@@ -580,6 +599,10 @@ static int set_engineclock(int gpu, int iEngineClock)
lock_adl();
if (ADL_Overdrive5_ODPerformanceLevels_Get(ga->iAdapterIndex, 0, lpOdPerformanceLevels) != ADL_OK)
goto out;
+ for (i = 0; i < lev; i++) {
+ if (lpOdPerformanceLevels->aLevels[i].iEngineClock > iEngineClock)
+ lpOdPerformanceLevels->aLevels[i].iEngineClock = iEngineClock;
+ }
lpOdPerformanceLevels->aLevels[lev].iEngineClock = iEngineClock;
if (ADL_Overdrive5_ODPerformanceLevels_Set(ga->iAdapterIndex, lpOdPerformanceLevels) != ADL_OK)
goto out;
@@ -623,8 +646,8 @@ static void get_memoryrange(int gpu, int *imin, int *imax)
static int set_memoryclock(int gpu, int iMemoryClock)
{
ADLODPerformanceLevels *lpOdPerformanceLevels;
+ int i, lev, ret = 1;
struct gpu_adl *ga;
- int lev, ret = 1;
if (!gpus[gpu].has_adl || !adl_active) {
wlogprint("Set memoryclock not supported\n");
@@ -642,6 +665,10 @@ static int set_memoryclock(int gpu, int iMemoryClock)
if (ADL_Overdrive5_ODPerformanceLevels_Get(ga->iAdapterIndex, 0, lpOdPerformanceLevels) != ADL_OK)
goto out;
lpOdPerformanceLevels->aLevels[lev].iMemoryClock = iMemoryClock;
+ for (i = 0; i < lev; i++) {
+ if (lpOdPerformanceLevels->aLevels[i].iMemoryClock > iMemoryClock)
+ lpOdPerformanceLevels->aLevels[i].iMemoryClock = iMemoryClock;
+ }
if (ADL_Overdrive5_ODPerformanceLevels_Set(ga->iAdapterIndex, lpOdPerformanceLevels) != ADL_OK)
goto out;
ADL_Overdrive5_ODPerformanceLevels_Get(ga->iAdapterIndex, 0, lpOdPerformanceLevels);
@@ -691,7 +718,7 @@ static float curses_float(const char *query)
static int set_vddc(int gpu, float fVddc)
{
ADLODPerformanceLevels *lpOdPerformanceLevels;
- int iVddc, lev, ret = 1;
+ int i, iVddc, lev, ret = 1;
struct gpu_adl *ga;
if (!gpus[gpu].has_adl || !adl_active) {
@@ -709,6 +736,10 @@ static int set_vddc(int gpu, float fVddc)
lock_adl();
if (ADL_Overdrive5_ODPerformanceLevels_Get(ga->iAdapterIndex, 0, lpOdPerformanceLevels) != ADL_OK)
goto out;
+ for (i = 0; i < lev; i++) {
+ if (lpOdPerformanceLevels->aLevels[i].iVddc > iVddc)
+ lpOdPerformanceLevels->aLevels[i].iVddc = iVddc;
+ }
lpOdPerformanceLevels->aLevels[lev].iVddc = iVddc;
if (ADL_Overdrive5_ODPerformanceLevels_Set(ga->iAdapterIndex, lpOdPerformanceLevels) != ADL_OK)
goto out;