diff options
| author | Mark Yacoub <markyacoub@google.com> | 2021-11-01 12:58:24 -0400 |
|---|---|---|
| committer | Mark Yacoub <markyacoub@google.com> | 2021-11-03 14:40:59 +0000 |
| commit | 0dfc3834f0e07badf5b6149c634807ddae119c88 (patch) | |
| tree | 3556efee4fc9feb579a9fbfd3c60db1c4991598c /tests/kms_cursor_legacy.c | |
| parent | c712ecac599add7e877883a7c8e2857d3c19836f (diff) | |
tests/kms_cursor_legacy: Use igt_require_intel before get_reloc_ahnd
[Why]
get_reloc_ahnd uses the intel allocator, which is not supported on
non-intel devices.
[How]
Call igt_require_intel before any call to get_reloc_ahnd.
Test: igt@kms_cursor_legacy@flip-vs-cursor-busy-crc-{atomic,legacy} on
ChromeOS Jacuzzi (MTK)
Signed-off-by: Mark Yacoub <markyacoub@chromium.org>
Reviewed-by: Petri Latvala <petri.latvala@intel.com>
Diffstat (limited to 'tests/kms_cursor_legacy.c')
| -rw-r--r-- | tests/kms_cursor_legacy.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/tests/kms_cursor_legacy.c b/tests/kms_cursor_legacy.c index 81362807..e48cdf6c 100644 --- a/tests/kms_cursor_legacy.c +++ b/tests/kms_cursor_legacy.c @@ -522,10 +522,16 @@ static void basic_flip_cursor(igt_display_t *display, struct igt_fb fb_info, cursor_fb, cursor_fb2, argb_fb; unsigned vblank_start; enum pipe pipe = find_connected_pipe(display, false); - uint64_t ahnd = (flags & BASIC_BUSY) ? get_reloc_ahnd(display->drm_fd, 0) : 0; + uint64_t ahnd = 0; igt_spin_t *spin; int i, miss1 = 0, miss2 = 0, delta; + if (flags & BASIC_BUSY) + { + igt_require_intel(display->drm_fd); + ahnd = get_reloc_ahnd(display->drm_fd, 0); + } + if (mode >= flip_test_atomic) igt_require(display->is_atomic); @@ -1327,6 +1333,7 @@ static void flip_vs_cursor_busy_crc(igt_display_t *display, bool atomic) igt_pipe_t *pipe_connected = &display->pipes[pipe]; igt_plane_t *plane_primary = igt_pipe_get_plane_type(pipe_connected, DRM_PLANE_TYPE_PRIMARY); igt_crc_t crcs[2], test_crc; + igt_require_intel(display->drm_fd); uint64_t ahnd = get_reloc_ahnd(display->drm_fd, 0); if (atomic) |