diff options
| author | Xin Li <delphij@google.com> | 2024-03-06 09:29:54 -0800 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2024-03-06 09:29:54 -0800 |
| commit | 5dc9e2f06b895a37f5fe84de8bf1850e17757e14 (patch) | |
| tree | fc3494e715903121eaae8c77f6739f949e7780bf | |
| parent | 96b80b7aae582ba533b2006d21a1554c14fcf334 (diff) | |
| parent | bf7d181c2b0f041439d0170dccb31b0cfc4315ce (diff) | |
| download | igt-gpu-tools-master.tar.gz | |
Bug: 319669529
Merged-In: Ib4cd458821a52a7185a2002e21934e72c6349a70
Change-Id: I9d67cf3a4039f9bdefa4c5a1dbbbe7b181d7b5d1
| -rw-r--r-- | Android.bp | 6 | ||||
| -rw-r--r-- | gtests/src/gtest_kms_addfb_basic.cpp | 3 | ||||
| -rw-r--r-- | tests/kms_addfb_basic.c | 3 | ||||
| -rw-r--r-- | tests/kms_setmode.c | 6 |
4 files changed, 18 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp index 01f59dbed..567772d75 100644 --- a/Android.bp +++ b/Android.bp @@ -231,3 +231,9 @@ cc_test { defaults: ["igt-gpu-tools-test-defaults"], srcs: ["tests/syncobj_wait.c"], } + +cc_test { + name: "kms_setmode", + defaults: ["igt-gpu-tools-test-defaults"], + srcs: ["tests/kms_setmode.c"], +} diff --git a/gtests/src/gtest_kms_addfb_basic.cpp b/gtests/src/gtest_kms_addfb_basic.cpp index 9c85f51a8..1f99b40fa 100644 --- a/gtests/src/gtest_kms_addfb_basic.cpp +++ b/gtests/src/gtest_kms_addfb_basic.cpp @@ -102,9 +102,12 @@ TEST_F(KmsAddfbBasic, TestAddfb25ModifierNoFlag) { runSubTest(testBinaryName, "addfb25-modifier-no-flag"); } +// TODO: b/254808989 +/* TEST_F(KmsAddfbBasic, TestAddfb25BadModifier) { runSubTest(testBinaryName, "addfb25-bad-modifier"); } +*/ TEST_F(KmsAddfbBasic, TestAddfb25XTiledMismatch) { runSubTest(testBinaryName, "addfb25-X-tiled-mismatch"); diff --git a/tests/kms_addfb_basic.c b/tests/kms_addfb_basic.c index 666e7165e..143e29471 100644 --- a/tests/kms_addfb_basic.c +++ b/tests/kms_addfb_basic.c @@ -492,12 +492,15 @@ static void addfb25_tests(int fd) igt_fixture f.flags = LOCAL_DRM_MODE_FB_MODIFIERS; + // TODO: b/254808989 + /* igt_subtest("addfb25-bad-modifier") { igt_require_fb_modifiers(fd); f.modifier[0] = ~0; igt_assert(drmIoctl(fd, LOCAL_DRM_IOCTL_MODE_ADDFB2, &f) < 0 && errno == EINVAL); } + */ igt_subtest_group { igt_fixture { diff --git a/tests/kms_setmode.c b/tests/kms_setmode.c index 8ace587ee..a47a886ee 100644 --- a/tests/kms_setmode.c +++ b/tests/kms_setmode.c @@ -23,7 +23,9 @@ #include "config.h" #include "igt.h" +#if defined(USE_CAIRO_PIXMAN) #include <cairo.h> +#endif #include <errno.h> #include <stdint.h> #include <unistd.h> @@ -134,6 +136,7 @@ static bool crtc_supports_mode(struct crtc_config *crtc, drmModeModeInfo *mode) return true; } +#if defined(USE_CAIRO_PIXMAN) static int paint_fb(struct igt_fb *fb, const char *test_name, const char **crtc_str, int crtc_count, int current_crtc_idx) { @@ -165,6 +168,7 @@ static int paint_fb(struct igt_fb *fb, const char *test_name, return 0; } +#endif static void create_fb_for_crtc(struct crtc_config *crtc, struct igt_fb *fb_info) @@ -569,7 +573,9 @@ static void test_crtc_config(const struct test_config *tconf, igt_info(" %s\n", crtc_strs[i]); create_fb_for_crtc(crtc, &crtc->fb_info); +#if defined(USE_CAIRO_PIXMAN) paint_fb(&crtc->fb_info, tconf->name, crtc_strs, crtc_count, i); +#endif ids = get_connector_ids(crtc); if (tconf->flags & TEST_STEALING) |