Commit 5a14ec53c88be2a8d4e2397d2b17a48681aad86b

Con Kolivas 2012-01-30T15:21:14

Add a --dev-reorder option to only reorder devices according to PCI Bus ID when requested.

diff --git a/adl.c b/adl.c
index d705575..1f00720 100644
--- a/adl.c
+++ b/adl.c
@@ -21,6 +21,7 @@
 #include "adl_functions.h"
 
 bool adl_active;
+bool opt_reorder = false;
 
 int opt_hysteresis = 3;
 const int opt_targettemp = 75;
@@ -263,7 +264,7 @@ void init_adl(int nDevs)
 		}
 	}
 
-	if (devs_match && devices == nDevs) {
+	if (opt_reorder && devs_match && devices == nDevs) {
 		/* Windows has some kind of random ordering for bus number IDs and
 		 * ordering the GPUs according to ascending order fixes it. Linux
 		 * has usually sequential but decreasing order instead! */
diff --git a/adl.h b/adl.h
index 8e54983..f0246c9 100644
--- a/adl.h
+++ b/adl.h
@@ -2,6 +2,7 @@
 #define __ADL_H__
 #ifdef HAVE_ADL
 bool adl_active;
+bool opt_reorder;
 int opt_hysteresis;
 const int opt_targettemp;
 const int opt_overheattemp;
diff --git a/main.c b/main.c
index 713253c..621af4a 100644
--- a/main.c
+++ b/main.c
@@ -1564,6 +1564,11 @@ static struct opt_table opt_config_table[] = {
 	OPT_WITHOUT_ARG("--disable-gpu|-G",
 			opt_set_bool, &opt_nogpu,
 			"Disable GPU mining even if suitable devices exist"),
+#ifdef HAVE_ADL
+	OPT_WITHOUT_ARG("--dev-reorder",
+			opt_set_bool, &opt_reorder,
+			"Attempt to reorder GPU devices according to PCI Bus ID"),
+#endif
 #endif
 	OPT_WITH_ARG("--donation",
 		     set_float_0_to_99, &opt_show_floatval, &opt_donation,