tests/gem_wait_rendering_timeout: properly skip test

also assign the timeout value unconditionally, we want to know it even
when we've timeout out.

diff --git a/tests/gem_wait_render_timeout.c b/tests/gem_wait_render_timeout.c
index 6ed3144..0d242af 100644 (file)
--- a/tests/gem_wait_render_timeout.c
+++ b/tests/gem_wait_render_timeout.c
@@ -75,12 +75,9 @@ gem_bo_wait_timeout(int fd, uint32_t handle, uint64_t *timeout_ns)
        wait.timeout_ns = *timeout_ns;
        wait.flags = 0;
        ret = drmIoctl(fd, WAIT_IOCTL, &wait);
-       if (ret)
-               return ret;
-
        *timeout_ns = wait.timeout_ns;
 
-       return ret;
+       return ret ? -errno : 0;
 }
 
 static void blt_color_fill(struct intel_batchbuffer *batch,
@@ -123,6 +120,12 @@ int main(int argc, char **argv)
        dst = drm_intel_bo_alloc(bufmgr, "dst", BUF_SIZE, 4096);
        dst2 = drm_intel_bo_alloc(bufmgr, "dst2", BUF_SIZE, 4096);
 
+       if (gem_bo_wait_timeout(fd, dst->handle, &timeout) == -EINVAL) {
+               printf("kernel doesn't support wait_timeout, skipping test\n");
+               return -77;
+       }
+       timeout = ENOUGH_WORK_IN_SECONDS * NSEC_PER_SEC;
+
        /* Figure out a rough number of fills required to consume 1 second of
         * GPU work.
         */