From: "José Roberto de Souza" <jose.souza@intel.com>
To: igt-dev@lists.freedesktop.org
Subject: [igt-dev] [PATCH i-g-t 1/2] lib: Skip tests that require fb modifiers when KMS is disabled
Date: Fri, 12 Oct 2018 14:28:26 -0700 [thread overview]
Message-ID: <20181012212827.30163-1-jose.souza@intel.com> (raw)
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
next reply other threads:[~2018-10-12 21:28 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-12 21:28 José Roberto de Souza [this message]
2018-10-12 21:28 ` [igt-dev] [PATCH i-g-t 2/2] tests: Skip testdisplay when KMS is disabled 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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181012212827.30163-1-jose.souza@intel.com \
--to=jose.souza@intel.com \
--cc=igt-dev@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox