Revert "RELAND: drm-tests: fix atomictest bugs"
This reverts commit 4fabaef46629d4a260fe06112854db4e25de6d4d.
Reason for revert: Speculative revert due to across the board failures/
Original change's description:
> RELAND: drm-tests: fix atomictest bugs
>
> Hopefully this intptr stuff works out this time..
>
> BUG=chromium:1104165
> TEST=CQ will test
>
> Change-Id: I832d4bcb276bc5caa476c65a4596c4b79ada27d0
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/drm-tests/+/2402153
> Tested-by: Gurchetan Singh <gurchetansingh@chromium.org>
> Reviewed-by: Po-Hsien Wang <pwang@chromium.org>
> Reviewed-by: Daniele Castagna <dcastagna@chromium.org>
> Commit-Queue: Gurchetan Singh <gurchetansingh@chromium.org>
Bug: chromium:1104165
Change-Id: I70ba854004e28cd5bd5da6ba1f5abdf80155ea8a
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/drm-tests/+/2465159
Reviewed-by: Ilja H. Friedel <ihf@chromium.org>
Tested-by: Ilja H. Friedel <ihf@chromium.org>
diff --git a/atomictest.c b/atomictest.c
index ff421e1..b823539 100644
--- a/atomictest.c
+++ b/atomictest.c
@@ -18,7 +18,7 @@
#include <getopt.h>
#include <inttypes.h>
#include <pthread.h>
-#include <libsync.h>
+#include <sync/sync.h>
#include "bs_drm.h"
@@ -561,7 +561,7 @@
return -1;
}
-static void log_ctx(struct atomictest_context *ctx)
+static void log(struct atomictest_context *ctx)
{
printf("Committing the following configuration: \n");
for (uint32_t i = 0; i < ctx->num_crtcs; i++) {
@@ -615,7 +615,7 @@
FD_ZERO(&fds);
FD_SET(ctx->fd, &fds);
- log_ctx(ctx);
+ log(ctx);
ret = drmModeAtomicCommit(ctx->fd, ctx->pset,
DRM_MODE_PAGE_FLIP_EVENT | DRM_MODE_ATOMIC_ALLOW_MODESET, NULL);
CHECK_RESULT(ret);
@@ -1140,7 +1140,7 @@
static void *inc_timeline(void *user_data)
{
- int timeline_fd = (int)(intptr_t)user_data;
+ int timeline_fd = *(int *)user_data;
uint32_t sleep_micro_secs = automatic ? 1e3 : 1e5;
usleep(sleep_micro_secs);
sw_sync_timeline_inc(timeline_fd, 1);
@@ -1160,7 +1160,7 @@
break;
}
- intptr_t timeline = (intptr_t)sw_sync_timeline_create();
+ int timeline = sw_sync_timeline_create();
CHECK(fcntl(timeline, F_GETFD, 0) >= 0);
int in_fence = sw_sync_fence_create(timeline, "test_in_fence", 1);
CHECK(fcntl(in_fence, F_GETFD, 0) >= 0);
@@ -1172,7 +1172,7 @@
set_crtc_props(crtc, ctx->pset);
CHECK(
- !pthread_create(&inc_timeline_thread, NULL, inc_timeline, (void *)timeline));
+ !pthread_create(&inc_timeline_thread, NULL, inc_timeline, &timeline));
ret |= test_and_commit(ctx, 1e6);
CHECK(!pthread_join(inc_timeline_thread, NULL));