diff options
| author | Safayat Ullah <safayat@google.com> | 2022-12-09 02:08:13 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-12-09 02:08:13 +0000 |
| commit | 3e362c6497f3e3cfbaa251f065733c1e3f76dcab (patch) | |
| tree | 55767fb01b9cebec380648d29ed0af11fb8ff7a5 | |
| parent | bc29848e38b3e09dc5b6b4bf50d61651e010200a (diff) | |
| parent | 49fc498c6fdef52c7fcc9693357b5190a70d0c26 (diff) | |
| download | igt-gpu-tools-3e362c6497f3e3cfbaa251f065733c1e3f76dcab.tar.gz | |
Fix kms_flip failed tests due to Intel specific requirement. am: 020db8a429 am: 033d3b46d0 am: 49fc498c6f
Original change: https://android-review.googlesource.com/c/platform/external/igt-gpu-tools/+/2335583
Change-Id: I4978196b952470d6f1b3022543ce0f0f2a56feb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rwxr-xr-x | tests/kms_flip.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/tests/kms_flip.c b/tests/kms_flip.c index bef748fea..5979bfa91 100755 --- a/tests/kms_flip.c +++ b/tests/kms_flip.c @@ -1250,14 +1250,21 @@ static void run_test_on_crtc_set(struct test_output *o, int *crtc_idxs, o->fb_width *= 2; tiling = LOCAL_DRM_FORMAT_MOD_NONE; - if (o->flags & TEST_FENCE_STRESS) + if (o->flags & TEST_FENCE_STRESS) { +#if defined(USE_INTEL) tiling = LOCAL_I915_FORMAT_MOD_X_TILED; +#else + igt_skip("Requires an intel device.\n"); +#endif + } /* 256 MB is usually the maximum mappable aperture, * (make it 4x times that to ensure failure) */ if (o->flags & TEST_BO_TOOBIG) { bo_size = 4*gem_mappable_aperture_size(); +#if defined(USE_INTEL) igt_require(bo_size < gem_global_aperture_size(drm_fd)); +#endif } o->fb_ids[0] = igt_create_fb(drm_fd, o->fb_width, o->fb_height, |