From: "Ville Syrjälä" <ville.syrjala@linux.intel.com>
To: Chris Wilson <chris@chris-wilson.co.uk>
Cc: igt-dev@lists.freedesktop.org
Subject: Re: [igt-dev] [PATCH i-g-t] igt/kms_addfb_basic: Skip if the KMS interface is not supported
Date: Thu, 13 Sep 2018 22:22:26 +0300 [thread overview]
Message-ID: <20180913192226.GT5565@intel.com> (raw)
In-Reply-To: <20180913190942.24201-1-chris@chris-wilson.co.uk>
On Thu, Sep 13, 2018 at 08:09:42PM +0100, Chris Wilson wrote:
> Some drivers and some hardware do not support KMS and so the addfb
> ioctls are expected to fail. However, since they are expected to fail
> with a specific errno (ENOTSUPP) in the case KMS is not supported on the
> fd, we can check for that and skip the tests where they are not
> appropriate.
>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> ---
> tests/kms_addfb_basic.c | 27 ++++++++++++++++++++++++++-
> 1 file changed, 26 insertions(+), 1 deletion(-)
>
> diff --git a/tests/kms_addfb_basic.c b/tests/kms_addfb_basic.c
> index ce48d24fa..400241a92 100644
> --- a/tests/kms_addfb_basic.c
> +++ b/tests/kms_addfb_basic.c
> @@ -667,12 +667,37 @@ static void prop_tests(int fd)
>
> }
>
> +static bool has_addfb2_iface(int fd)
> +{
> + struct local_drm_mode_fb_cmd2 f = {};
> + int err;
> +
> + err = 0;
> + if (drmIoctl(fd, DRM_IOCTL_MODE_ADDFB2, &f))
> + err = -errno;
> + switch (err) {
> + case -ENOTTY: /* ioctl unrecognised (kernel too old) */
> + case -ENOTSUP: /* driver doesn't support KMS */
P once or P twice?
Oh, ENOTSUPP not in uapi headers AFAICS. Is this the same thing even?
> + return false;
> +
> + /*
> + * The only other valid response is -EINVAL, but we leave
> + * that for the actual tests themselves to discover for
> + * more accurate reporting.
> + */
> + default:
> + return true;
> + }
> +}
> +
> int fd;
>
> igt_main
> {
> - igt_fixture
> + igt_fixture {
> fd = drm_open_driver_master(DRIVER_ANY);
> + igt_require(has_addfb2_iface(fd));
> + }
>
> invalid_tests(fd);
>
> --
> 2.19.0
>
> _______________________________________________
> igt-dev mailing list
> igt-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/igt-dev
--
Ville Syrjälä
Intel
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
next prev parent reply other threads:[~2018-09-13 19:22 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-13 19:09 [igt-dev] [PATCH i-g-t] igt/kms_addfb_basic: Skip if the KMS interface is not supported Chris Wilson
2018-09-13 19:22 ` Ville Syrjälä [this message]
2018-09-13 19:24 ` Chris Wilson
2018-09-13 19:25 ` Ville Syrjälä
2018-09-13 19:46 ` Ville Syrjälä
2018-09-13 19:59 ` 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=20180913192226.GT5565@intel.com \
--to=ville.syrjala@linux.intel.com \
--cc=chris@chris-wilson.co.uk \
--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