diff options
| author | Safayat Ullah <safayat@google.com> | 2022-12-09 01:17:12 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-12-09 01:17:12 +0000 |
| commit | 49fc498c6fdef52c7fcc9693357b5190a70d0c26 (patch) | |
| tree | 7583c9f05e7faef45b4721acc00dbe48602fbade | |
| parent | 1e869dce14476770603fc381ce21819737713972 (diff) | |
| parent | 033d3b46d095267e652c6b1718dd597dd6037078 (diff) | |
| download | igt-gpu-tools-49fc498c6fdef52c7fcc9693357b5190a70d0c26.tar.gz | |
Fix kms_flip failed tests due to Intel specific requirement. am: 020db8a429 am: 033d3b46d0android-u-beta-1-gpl
Original change: https://android-review.googlesource.com/c/platform/external/igt-gpu-tools/+/2335583
Change-Id: Idd04039bbd5fe7a297e4a7ee40cfea6d042d4975
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 574d038cd..6d937e6c0 100755 --- a/tests/kms_flip.c +++ b/tests/kms_flip.c @@ -1245,14 +1245,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, |