diff mbox series

[i-g-t,2/5] igt/prime_vgem: Skip flip if no display

Message ID 20180928102002.10541-2-chris@chris-wilson.co.uk (mailing list archive)
State New, archived
Headers show
Series [i-g-t,1/5] igt/kms_getfb: Check the iface exists before use | expand

Commit Message

Chris Wilson Sept. 28, 2018, 10:19 a.m. UTC 
We try flipping a vgem surface onto a  i915 scanout. However, if there
is no display we want to disable the kms interface, including the addfb
ioctl. On such systems the call to kms_addfb will naturally fail and the
test cannot be run.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
 tests/prime_vgem.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
diff mbox series

Patch

diff --git a/tests/prime_vgem.c b/tests/prime_vgem.c
index 5e0c4e289..98005ead2 100644
--- a/tests/prime_vgem.c
+++ b/tests/prime_vgem.c
@@ -766,11 +766,13 @@  static void test_flip(int i915, int vgem, unsigned hang)
 
 		strides[0] = bo[i].pitch;
 
-		do_or_die(__kms_addfb(i915, handle[i],
-				      bo[i].width, bo[i].height,
-				      DRM_FORMAT_XRGB8888, I915_TILING_NONE,
-				      strides, offsets, 1,
-				      LOCAL_DRM_MODE_FB_MODIFIERS, &fb_id[i]));
+		/* May skip if i915 has no displays */
+		igt_require(__kms_addfb(i915, handle[i],
+					bo[i].width, bo[i].height,
+					DRM_FORMAT_XRGB8888, I915_TILING_NONE,
+					strides, offsets, 1,
+					LOCAL_DRM_MODE_FB_MODIFIERS,
+				       	&fb_id[i]));
 		igt_assert(fb_id[i]);
 	}