lib/drmtest: rip out drm_open_any_master

It's unused. Also most of our tests failed to ask for the right type
of drm fd anyway. So it's imo better to just let them fall over when
they don't get master but want it, like they already do today.

This also allows us to garbage-collect the master parameter to
drm_get_card and associated code.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

6 files changed, 7 insertions, 7 deletions

diff --git a/tests/gem_flink_race.c b/tests/gem_flink_race.c
index 0680b2e4..2e97f76f 100644
--- a/tests/gem_flink_race.c
+++ b/tests/gem_flink_race.c
@@ -51,7 +51,7 @@ static int get_object_count(void)
 {
 	FILE *file;
 	int ret, scanned;
-	int device = drm_get_card(0);
+	int device = drm_get_card();
 	char *path;
 
 	ret = asprintf(&path, "/sys/kernel/debug/dri/%d/i915_gem_objects", device);
diff --git a/tests/gem_seqno_wrap.c b/tests/gem_seqno_wrap.c
index 4be54cbc..7549eb63 100644
--- a/tests/gem_seqno_wrap.c
+++ b/tests/gem_seqno_wrap.c
@@ -648,7 +648,7 @@ int main(int argc, char **argv)
 
 	parse_options(argc, argv);
 
-	card_index = drm_get_card(0);
+	card_index = drm_get_card();
 	igt_assert(card_index != -1);
 
 	srandom(time(NULL));
diff --git a/tests/kms_flip.c b/tests/kms_flip.c
index 1d4a884e..fe85dcb0 100644
--- a/tests/kms_flip.c
+++ b/tests/kms_flip.c
@@ -570,7 +570,7 @@ static void eat_error_state(struct test_output *o)
 	static const char data[] = "";
 	static char tmp[128];
 	char fname[FILENAME_MAX];
-	int card_index = drm_get_card(0);
+	int card_index = drm_get_card();
 	int fd;
 	ssize_t r;
 
@@ -624,7 +624,7 @@ static void hang_gpu(struct test_output *o)
 	static const char dfs_entry[] = "i915_ring_stop";
 	static const char data[] = "0xf";
 	char fname[FILENAME_MAX];
-	int card_index = drm_get_card(0);
+	int card_index = drm_get_card();
 	int fd;
 	ssize_t r;
 
diff --git a/tests/prime_self_import.c b/tests/prime_self_import.c
index 6b3611d6..32b9aa71 100644
--- a/tests/prime_self_import.c
+++ b/tests/prime_self_import.c
@@ -216,7 +216,7 @@ static int get_object_count(void)
 {
 	FILE *file;
 	int ret, scanned;
-	int device = drm_get_card(0);
+	int device = drm_get_card();
 	char *path;
 
 	ret = asprintf(&path, "/sys/kernel/debug/dri/%d/i915_gem_objects", device);
diff --git a/tests/sysfs_rc6_residency.c b/tests/sysfs_rc6_residency.c
index 7e75acc9..f96d5eca 100644
--- a/tests/sysfs_rc6_residency.c
+++ b/tests/sysfs_rc6_residency.c
@@ -56,7 +56,7 @@ static unsigned int readit(const char *path)
 
 int main(int argc, char *argv[])
 {
-	const int device = drm_get_card(0);
+	const int device = drm_get_card();
 	char *path, *pathp, *pathpp;
 	int fd, ret;
 	unsigned int value1, value1p, value1pp, value2, value2p, value2pp;
diff --git a/tests/sysfs_rps.c b/tests/sysfs_rps.c
index 867f9130..55804c0e 100644
--- a/tests/sysfs_rps.c
+++ b/tests/sysfs_rps.c
@@ -129,7 +129,7 @@ static void dumpit(void)
 
 int main(int argc, char *argv[])
 {
-	const int device = drm_get_card(0);
+	const int device = drm_get_card();
 	struct junk *junk = stuff;
 	int fd, ret;