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>
This commit is contained in:
Daniel Vetter
2013-08-19 10:34:34 +02:00
parent 4ba1f2e104
commit 5951ffb6a0
9 changed files with 12 additions and 65 deletions
+1 -1
View File
@@ -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);
+1 -1
View File
@@ -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));
+2 -2
View File
@@ -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;
+1 -1
View File
@@ -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);
+1 -1
View File
@@ -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;
+1 -1
View File
@@ -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;