From: Mika Kuoppala <mika.kuoppala@linux.intel.com>
To: Chris Wilson <chris@chris-wilson.co.uk>, intel-gfx@lists.freedesktop.org
Cc: igt-dev@lists.freedesktop.org, matthew.auld@intel.com,
tvrtko.ursulin@intel.com
Subject: Re: [igt-dev] [Intel-gfx] [PATCH i-g-t 3/3] igt/drv_missed_irq: Skip if the kernel reports no rings available to test
Date: Wed, 16 Jan 2019 16:30:33 +0200 [thread overview]
Message-ID: <87d0owy8s6.fsf@gaia.fi.intel.com> (raw)
In-Reply-To: <20190116093509.30195-3-chris@chris-wilson.co.uk>
Chris Wilson <chris@chris-wilson.co.uk> writes:
> Some setups (e.g. guc and gen10+) can not disable the MI_USER_INTERRUPT
> generation and so can not simulate missed interrupts. These tests would
> fail, so skip when the kernel reports no tests available.
>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
> ---
> lib/igt_gt.c | 2 +-
> tests/i915/missed_irq.c | 1 +
> 2 files changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/lib/igt_gt.c b/lib/igt_gt.c
> index a20619246..dd28d821d 100644
> --- a/lib/igt_gt.c
> +++ b/lib/igt_gt.c
> @@ -535,7 +535,7 @@ unsigned intel_detect_and_clear_missed_interrupts(int fd)
> dir = igt_debugfs_dir(fd);
>
> missed = 0;
> - igt_assert(igt_sysfs_scanf(dir, "i915_ring_missed_irq", "%x", &missed) == 1);
> + igt_sysfs_scanf(dir, "i915_ring_missed_irq", "%x", &missed);
> if (missed)
> igt_sysfs_set(dir, "i915_ring_missed_irq", "0");
>
> diff --git a/tests/i915/missed_irq.c b/tests/i915/missed_irq.c
> index 78690c36a..cade3f371 100644
> --- a/tests/i915/missed_irq.c
> +++ b/tests/i915/missed_irq.c
> @@ -113,6 +113,7 @@ igt_simple_main
> debugfs = igt_debugfs_dir(device);
>
> expect_rings = engine_mask(debugfs);
> + igt_require(expect_rings);
>
> igt_debug("Clearing rings %x\n", expect_rings);
> intel_detect_and_clear_missed_interrupts(device);
> --
> 2.20.1
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
WARNING: multiple messages have this Message-ID (diff)
From: Mika Kuoppala <mika.kuoppala@linux.intel.com>
To: Chris Wilson <chris@chris-wilson.co.uk>, intel-gfx@lists.freedesktop.org
Cc: igt-dev@lists.freedesktop.org, matthew.auld@intel.com
Subject: Re: [PATCH i-g-t 3/3] igt/drv_missed_irq: Skip if the kernel reports no rings available to test
Date: Wed, 16 Jan 2019 16:30:33 +0200 [thread overview]
Message-ID: <87d0owy8s6.fsf@gaia.fi.intel.com> (raw)
In-Reply-To: <20190116093509.30195-3-chris@chris-wilson.co.uk>
Chris Wilson <chris@chris-wilson.co.uk> writes:
> Some setups (e.g. guc and gen10+) can not disable the MI_USER_INTERRUPT
> generation and so can not simulate missed interrupts. These tests would
> fail, so skip when the kernel reports no tests available.
>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
> ---
> lib/igt_gt.c | 2 +-
> tests/i915/missed_irq.c | 1 +
> 2 files changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/lib/igt_gt.c b/lib/igt_gt.c
> index a20619246..dd28d821d 100644
> --- a/lib/igt_gt.c
> +++ b/lib/igt_gt.c
> @@ -535,7 +535,7 @@ unsigned intel_detect_and_clear_missed_interrupts(int fd)
> dir = igt_debugfs_dir(fd);
>
> missed = 0;
> - igt_assert(igt_sysfs_scanf(dir, "i915_ring_missed_irq", "%x", &missed) == 1);
> + igt_sysfs_scanf(dir, "i915_ring_missed_irq", "%x", &missed);
> if (missed)
> igt_sysfs_set(dir, "i915_ring_missed_irq", "0");
>
> diff --git a/tests/i915/missed_irq.c b/tests/i915/missed_irq.c
> index 78690c36a..cade3f371 100644
> --- a/tests/i915/missed_irq.c
> +++ b/tests/i915/missed_irq.c
> @@ -113,6 +113,7 @@ igt_simple_main
> debugfs = igt_debugfs_dir(device);
>
> expect_rings = engine_mask(debugfs);
> + igt_require(expect_rings);
>
> igt_debug("Clearing rings %x\n", expect_rings);
> intel_detect_and_clear_missed_interrupts(device);
> --
> 2.20.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2019-01-16 14:30 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-16 9:35 [igt-dev] [PATCH i-g-t 1/3] i915/gem_userptr_blits: Only mlock the memfd once, not the arena Chris Wilson
2019-01-16 9:35 ` Chris Wilson
2019-01-16 9:35 ` [igt-dev] [PATCH i-g-t 2/3] i915/gem_cpu_reloc: Use a self-modifying chained batch Chris Wilson
2019-01-16 9:35 ` Chris Wilson
2019-01-16 14:22 ` [igt-dev] [Intel-gfx] " Mika Kuoppala
2019-01-16 14:22 ` Mika Kuoppala
2019-01-16 14:30 ` [igt-dev] [Intel-gfx] " Chris Wilson
2019-01-16 14:30 ` Chris Wilson
2019-01-16 14:49 ` [igt-dev] [Intel-gfx] " Mika Kuoppala
2019-01-16 14:49 ` Mika Kuoppala
2019-01-16 9:35 ` [igt-dev] [PATCH i-g-t 3/3] igt/drv_missed_irq: Skip if the kernel reports no rings available to test Chris Wilson
2019-01-16 9:35 ` Chris Wilson
2019-01-16 14:30 ` Mika Kuoppala [this message]
2019-01-16 14:30 ` Mika Kuoppala
2019-01-16 9:47 ` [igt-dev] [Intel-gfx] [PATCH i-g-t 1/3] i915/gem_userptr_blits: Only mlock the memfd once, not the arena Mika Kuoppala
2019-01-16 9:47 ` Mika Kuoppala
2019-01-16 9:58 ` [Intel-gfx] " Chris Wilson
2019-01-16 9:58 ` Chris Wilson
2019-01-16 10:35 ` [igt-dev] [Intel-gfx] " Mika Kuoppala
2019-01-16 10:35 ` Mika Kuoppala
2019-01-16 10:46 ` [igt-dev] [Intel-gfx] " Chris Wilson
2019-01-16 10:46 ` Chris Wilson
2019-01-16 10:27 ` [igt-dev] ✓ Fi.CI.BAT: success for series starting with [i-g-t,1/3] " Patchwork
2019-01-16 11:58 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
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=87d0owy8s6.fsf@gaia.fi.intel.com \
--to=mika.kuoppala@linux.intel.com \
--cc=chris@chris-wilson.co.uk \
--cc=igt-dev@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=matthew.auld@intel.com \
--cc=tvrtko.ursulin@intel.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.