From: Paulo Zanoni <paulo.r.zan...@intel.com>
Previously, when called without any arguments, the application required
user input to finish. However, testdisplay is ran by "make check", and
it is not a good idea to run a program that requires user input in "make
check". So we change the default behavior to something that doesn't
require user input. You can still access the previous behavior using the
"-m" argument.
Signed-off-by: Paulo Zanoni <paulo.r.zan...@intel.com>
---
tests/testdisplay.c | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/tests/testdisplay.c b/tests/testdisplay.c
index 94c6e74..cae04e9 100644
--- a/tests/testdisplay.c
+++ b/tests/testdisplay.c
@@ -946,7 +946,7 @@ static void update_display(void)
extern char *optarg;
extern int optind, opterr, optopt;
-static char optstr[] = "hiaf:s:d:pt";
+static char optstr[] = "hiaf:s:d:pmt";
static void usage(char *name)
{
@@ -956,11 +956,12 @@ static void usage(char *name)
fprintf(stderr, "\t-s\t<duration>\tsleep between each mode test\n");
fprintf(stderr, "\t-d\t<depth>\tbit depth of scanout buffer\n");
fprintf(stderr, "\t-p\ttest overlay plane\n");
+ fprintf(stderr, "\t-m\ttest the preferred mode\n");
fprintf(stderr, "\t-t\tuse a tiled framebuffer\n");
fprintf(stderr, "\t-f\t<clock
MHz>,<hdisp>,<hsync-start>,<hsync-end>,<htotal>,\n");
fprintf(stderr, "\t\t<vdisp>,<vsync-start>,<vsync-end>,<vtotal>\n");
fprintf(stderr, "\t\ttest force mode\n");
- fprintf(stderr, "\tDefault is to test the preferred mode.\n");
+ fprintf(stderr, "\tDefault is to test all modes.\n");
exit(0);
}
@@ -1043,6 +1044,9 @@ int main(int argc, char **argv)
case 'p':
test_plane = 1;
break;
+ case 'm':
+ test_preferred_mode = 1;
+ break;
case 't':
enable_tiling = 1;
break;
@@ -1054,8 +1058,9 @@ int main(int argc, char **argv)
break;
}
}
- if (!test_all_modes && !force_mode && !dump_info)
- test_preferred_mode = 1;
+ if (!test_all_modes && !force_mode && !dump_info &&
+ !test_preferred_mode)
+ test_all_modes = 1;
for (i = 0; i < ARRAY_SIZE(modules); i++) {
fd = drmOpen(modules[i], NULL);
--
1.7.4.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
