tests: remove missleading comments

[android-x86/external-libdrm.git] / tests / vbltest / vbltest.c

diff --git a/tests/vbltest/vbltest.c b/tests/vbltest/vbltest.c
index 1297da8..1833321 100644 (file)
--- a/tests/vbltest/vbltest.c
+++ b/tests/vbltest/vbltest.c
@@ -1,5 +1,5 @@
 /*
- * DRM based mode setting test program
+ * DRM based vblank test program
  * Copyright 2008 Tungsten Graphics
  *   Jakob Bornecrantz <jakob@tungstengraphics.com>
  * Copyright 2008 Intel Corporation
@@ -24,20 +24,9 @@
  * IN THE SOFTWARE.
  */
 
-/*
- * This fairly simple test program dumps output in a similar format to the
- * "xrandr" tool everyone knows & loves.  It's necessarily slightly different
- * since the kernel separates outputs into encoder and connector structures,
- * each with their own unique ID.  The program also allows test testing of the
- * memory management and mode setting APIs by allowing the user to specify a
- * connector and mode to use for mode setting.  If all works as expected, a
- * blue background should be painted on the monitor attached to the specified
- * connector after the selected mode is set.
- *
- * TODO: use cairo to write the mode info on the selected output once
- *       the mode has been programmed, along with possible test patterns.
- */
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
 
 #include <assert.h>
 #include <stdio.h>
@@ -52,11 +41,12 @@
 #include "xf86drm.h"
 #include "xf86drmMode.h"
 
-#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
+#include "util/common.h"
+#include "util/kms.h"
 
 extern char *optarg;
 extern int optind, opterr, optopt;
-static char optstr[] = "s";
+static char optstr[] = "D:M:s";
 
 int secondary = 0;
 
@@ -95,15 +85,19 @@ static void vblank_handler(int fd, unsigned int frame, unsigned int sec,
 
 static void usage(char *name)
 {
-       fprintf(stderr, "usage: %s [-s]\n", name);
-       fprintf(stderr, "\t-s\tuse secondary pipe\n");
+       fprintf(stderr, "usage: %s [-DMs]\n", name);
+       fprintf(stderr, "\n");
+       fprintf(stderr, "options:\n");
+       fprintf(stderr, "  -D DEVICE  open the given device\n");
+       fprintf(stderr, "  -M MODULE  open the given module\n");
+       fprintf(stderr, "  -s         use secondary pipe\n");
        exit(0);
 }
 
 int main(int argc, char **argv)
 {
-       int i, c, fd;
-       char *modules[] = { "i915", "radeon", "nouveau" };
+       const char *device = NULL, *module = NULL;
+       int c, fd, ret;
        drmVBlank vbl;
        drmEventContext evctx;
        struct vbl_info handler_info;
@@ -111,6 +105,12 @@ int main(int argc, char **argv)
        opterr = 0;
        while ((c = getopt(argc, argv, optstr)) != -1) {
                switch (c) {
+               case 'D':
+                       device = optarg;
+                       break;
+               case 'M':
+                       module = optarg;
+                       break;
                case 's':
                        secondary = 1;
                        break;
@@ -120,28 +120,20 @@ int main(int argc, char **argv)
                }
        }
 
-       for (i = 0; i < ARRAY_SIZE(modules); i++) {
-               printf("trying to load module %s...", modules[i]);
-               fd = drmOpen(modules[i], NULL);
-               if (fd < 0) {
-                       printf("failed.\n");
-               } else {
-                       printf("success.\n");
-                       break;
-               }
-       }
-
-       if (i == ARRAY_SIZE(modules)) {
-               fprintf(stderr, "failed to load any modules, aborting.\n");
-               return -1;
-       }
+       fd = util_open(module, device);
+       if (fd < 0)
+               return 1;
 
        /* Get current count first */
        vbl.request.type = DRM_VBLANK_RELATIVE;
        if (secondary)
                vbl.request.type |= DRM_VBLANK_SECONDARY;
        vbl.request.sequence = 0;
-       drmWaitVBlank(fd, &vbl);
+       ret = drmWaitVBlank(fd, &vbl);
+       if (ret != 0) {
+               printf("drmWaitVBlank (relative) failed ret: %i\n", ret);
+               return -1;
+       }
 
        printf("starting count: %d\n", vbl.request.sequence);
 
@@ -154,7 +146,11 @@ int main(int argc, char **argv)
                vbl.request.type |= DRM_VBLANK_SECONDARY;
        vbl.request.sequence = 1;
        vbl.request.signal = (unsigned long)&handler_info;
-       drmWaitVBlank(fd, &vbl);
+       ret = drmWaitVBlank(fd, &vbl);
+       if (ret != 0) {
+               printf("drmWaitVBlank (relative, event) failed ret: %i\n", ret);
+               return -1;
+       }
 
        /* Set up our event handler */
        memset(&evctx, 0, sizeof evctx);
@@ -166,7 +162,6 @@ int main(int argc, char **argv)
        while (1) {
                struct timeval timeout = { .tv_sec = 3, .tv_usec = 0 };
                fd_set fds;
-               int ret;
 
                FD_ZERO(&fds);
                FD_SET(0, &fds);
@@ -181,7 +176,11 @@ int main(int argc, char **argv)
                        break;
                }
 
-               drmHandleEvent(fd, &evctx);
+               ret = drmHandleEvent(fd, &evctx);
+               if (ret != 0) {
+                       printf("drmHandleEvent failed: %i\n", ret);
+                       return -1;
+               }
        }
 
        return 0;