[IGT-GPU-Tools] Add new test binary from existing test files

Bug: 246488325
Test: run any tests added in here
Change-Id: I22e55e12f75c657a0382fd17619385f5ea612c59

3 files changed, 9 insertions, 68 deletions

diff --git a/Android.bp b/Android.bp
index c9e270244..26eef7c99 100644
--- a/Android.bp
+++ b/Android.bp
@@ -170,11 +170,11 @@ cc_test {
     srcs: ["tests/core_getclient.c"],
 }
 
-// cc_test {
-//     name: "drm_read",
-//     defaults: ["igt-gpu-tools-test-defaults"],
-//     srcs: ["tests/drm_read.c"]
-// }
+cc_test {
+    name: "drm_read",
+    defaults: ["igt-gpu-tools-test-defaults"],
+    srcs: ["tests/drm_read.c"]
+}
 
 cc_test {
     name: "kms_addfb_basic",
@@ -200,60 +200,12 @@ cc_test {
     srcs: ["tests/kms_atomic_transition.c"],
 }
 
-// cc_test {
-//     name: "kms_color",
-//     defaults: ["igt-gpu-tools-test-defaults"],
-//     srcs: ["tests/kms_color.c"],
-// }
-
-// cc_test {
-//     name: "kms_concurrent",
-//     defaults: ["igt-gpu-tools-test-defaults"],
-//     srcs: ["tests/kms_concurrent.c"],
-// }
-
-// cc_test {
-//     name: "kms_crtc_background_color",
-//     defaults: ["igt-gpu-tools-test-defaults"],
-//     srcs: ["tests/kms_crtc_background_color.c"],
-// }
-
-cc_test {
-    name: "kms_flip_tiling",
-    defaults: ["igt-gpu-tools-test-defaults"],
-    srcs: ["tests/kms_flip_tiling.c"],
-}
-
-// cc_test {
-//     name: "kms_frontbuffer_tracking",
-//     defaults: ["igt-gpu-tools-test-defaults"],
-//     srcs: ["tests/kms_frontbuffer_tracking.c"],
-// }
-
-// cc_test {
-//     name: "kms_plane_alpha_blend",
-//     defaults: ["igt-gpu-tools-test-defaults"],
-//     srcs: ["tests/kms_plane_alpha_blend.c"],
-// }
-
-// cc_test {
-//     name: "kms_plane",
-//     defaults: ["igt-gpu-tools-test-defaults"],
-//     srcs: ["tests/kms_plane.c"],
-// }
-
 cc_test {
     name: "kms_plane_lowres",
     defaults: ["igt-gpu-tools-test-defaults"],
     srcs: ["tests/kms_plane_lowres.c"],
 }
 
-// cc_test {
-//     name: "kms_plane_multiple",
-//     defaults: ["igt-gpu-tools-test-defaults"],
-//     srcs: ["tests/kms_plane_multiple.c"],
-// }
-
 cc_test {
     name: "kms_plane_scaling",
     defaults: ["igt-gpu-tools-test-defaults"],
@@ -266,18 +218,6 @@ cc_test {
     srcs: ["tests/kms_prop_blob.c"],
 }
 
-// cc_test {
-//     name: "kms_setmode",
-//     defaults: ["igt-gpu-tools-test-defaults"],
-//     srcs: ["tests/kms_setmode.c"],
-// }
-
-// cc_test {
-//     name: "kms_vrr",
-//     defaults: ["igt-gpu-tools-test-defaults"],
-//     srcs: ["tests/kms_vrr.c"],
-// }
-
 cc_test {
     name: "syncobj_basic",
     defaults: ["igt-gpu-tools-test-defaults"],
diff --git a/tests/drm_read.c b/tests/drm_read.c
index cfb1c04d7..cd07ec6a4 100644
--- a/tests/drm_read.c
+++ b/tests/drm_read.c
@@ -44,6 +44,7 @@
 #include <sys/time.h>
 #include <sys/poll.h>
 #include <pthread.h>
+#include <sched.h>
 #include "drm.h"
 
 IGT_TEST_DESCRIPTION("Call read(drm) and see if it behaves.");
@@ -106,7 +107,7 @@ static void test_invalid_buffer(int in)
 
 	alarm(1);
 
-	igt_assert_eq(read(fd, (void *)-1, 4096), -1);
+	igt_assert_eq(read(fd, (void *)-1, 0), -1);
 	igt_assert_eq(errno, EFAULT);
 
 	teardown(fd);
@@ -220,7 +221,7 @@ static void test_short_buffer_wakeup(int in, enum pipe pipe)
 		pthread_mutex_unlock(&w.mutex);
 
 		/* Give each thread a chance to sleep in drm_read() */
-		pthread_yield();
+		sched_yield();
 
 		/* One event should wake all threads as none consume */
 		generate_event(w.fd, pipe);
diff --git a/tests/kms_plane_scaling.c b/tests/kms_plane_scaling.c
index 0bd369045..c432beb46 100644
--- a/tests/kms_plane_scaling.c
+++ b/tests/kms_plane_scaling.c
@@ -627,7 +627,7 @@ igt_main
 	igt_skip_on_simulation();
 
 	igt_fixture {
-		data.drm_fd = drm_open_driver_master(DRIVER_INTEL | DRIVER_AMDGPU);
+		data.drm_fd = drm_open_driver_master(DRIVER_ANY);
 		igt_display_require(&data.display, data.drm_fd);
 		data.devid = is_i915_device(data.drm_fd) ?
 			intel_get_drm_devid(data.drm_fd) : 0;