public inbox for igt-dev@lists.freedesktop.org
 help / color / mirror / Atom feed
* [igt-dev] [PATCH i-g-t 1/2] lib: Skip tests that require fb modifiers when KMS is disabled
@ 2018-10-12 21:28 José Roberto de Souza
  2018-10-12 21:28 ` [igt-dev] [PATCH i-g-t 2/2] tests: Skip testdisplay " José Roberto de Souza
                   ` (3 more replies)
  0 siblings, 4 replies; 8+ messages in thread
From: José Roberto de Souza @ 2018-10-12 21:28 UTC (permalink / raw)
  To: igt-dev

When KMS is disabled, drmGetCap() for DRM_CAP_ADDFB2_MODIFIERS() will
return -1 and set errno as EOPNOTSUPP, the current assert was only
checking for a sucess result or invalid argument causing
prime_vgem@basic-fence-flip test to fail when KMS is disabled.

Cc: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
---
 lib/ioctl_wrappers.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ioctl_wrappers.c b/lib/ioctl_wrappers.c
index 0929c43f..bda9a764 100644
--- a/lib/ioctl_wrappers.c
+++ b/lib/ioctl_wrappers.c
@@ -1661,7 +1661,7 @@ void igt_require_fb_modifiers(int fd)
 		int ret;
 
 		ret = drmGetCap(fd, DRM_CAP_ADDFB2_MODIFIERS, &cap_modifiers);
-		igt_assert(ret == 0 || errno == EINVAL);
+		igt_assert(ret == 0 || errno == EINVAL || errno == EOPNOTSUPP);
 		has_modifiers = ret == 0 && cap_modifiers == 1;
 		cap_modifiers_tested = true;
 	}
-- 
2.19.1

_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

^ permalink raw reply related	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2018-10-16 15:54 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-10-12 21:28 [igt-dev] [PATCH i-g-t 1/2] lib: Skip tests that require fb modifiers when KMS is disabled José Roberto de Souza
2018-10-12 21:28 ` [igt-dev] [PATCH i-g-t 2/2] tests: Skip testdisplay " José Roberto de Souza
2018-10-13 10:25   ` Chris Wilson
2018-10-15 21:52     ` Souza, Jose
2018-10-16 15:54       ` Rodrigo Vivi
2018-10-12 21:58 ` [igt-dev] ✓ Fi.CI.BAT: success for series starting with [i-g-t,1/2] lib: Skip tests that require fb modifiers " Patchwork
2018-10-13  2:05 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
2018-10-13 10:20 ` [igt-dev] [PATCH i-g-t 1/2] " Chris Wilson

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox