public inbox for intel-gfx@lists.freedesktop.org
 help / color / mirror / Atom feed
From: David Weinehall <david.weinehall@linux.intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: [PATCH i-g-t] tests/pm_rpm: Fix CRASH on machines that lack LLC
Date: Wed,  2 Mar 2016 15:11:57 +0200	[thread overview]
Message-ID: <1456924317-23525-1-git-send-email-david.weinehall@linux.intel.com> (raw)

On machines that lack an LLC the pm-caching subtest will
terminate with sigbus and thus CRASH during the
I915_CACHING_CACHED iteration.  This patch adds a check for
this condition and skips that iteration.

Signed-off-by: David Weinehall <david.weinehall@linux.intel.com>
---
 tests/pm_rpm.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/tests/pm_rpm.c b/tests/pm_rpm.c
index 2aa6c1018aa2..c25252eafad0 100644
--- a/tests/pm_rpm.c
+++ b/tests/pm_rpm.c
@@ -1813,6 +1813,16 @@ static void pm_test_caching(void)
 	gem_buf = gem_mmap__gtt(drm_fd, handle, gtt_obj_max_size, PROT_WRITE);
 
 	for (i = 0; i < ARRAY_SIZE(cache_levels); i++) {
+		/*
+		 * Skip the I915_CACHING_CACHED test
+		 * if we lack an LLC cache
+		 */
+		if (cache_levels[i] == I915_CACHING_CACHED &&
+		    !gem_has_llc(drm_fd)) {
+			igt_debug("!gem_has_llc(); skipping\n");
+			continue;
+		}
+
 		memset(gem_buf, 16 << i, gtt_obj_max_size);
 
 		disable_all_screens_and_wait(&ms_data);
-- 
2.7.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

             reply	other threads:[~2016-03-02 13:13 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-03-02 13:11 David Weinehall [this message]
2016-03-02 13:27 ` [PATCH i-g-t] tests/pm_rpm: Fix CRASH on machines that lack LLC Chris Wilson
2016-03-02 13:55   ` David Weinehall
2016-03-02 14:04     ` Chris Wilson
2016-03-02 14:32       ` Imre Deak
2016-03-02 14:37         ` Chris Wilson
2016-03-02 14:41           ` Imre Deak
2016-03-02 14:49             ` Chris Wilson
2016-03-02 15:01               ` Imre Deak
2016-03-02 15:28                 ` Chris Wilson
2016-03-02 16:23                   ` Imre Deak
2016-03-02 14:38       ` David Weinehall
2016-03-02 15:50 ` [PATCH i-g-t v2] " David Weinehall
2016-03-02 16:06   ` Chris Wilson
2016-03-02 16:02 ` [PATCH i-g-t v3] " David Weinehall
2016-03-02 17:01 ` [PATCH i-g-t v4] " David Weinehall
2016-03-02 17:20   ` Chris Wilson
2016-03-02 17:32     ` Imre Deak

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=1456924317-23525-1-git-send-email-david.weinehall@linux.intel.com \
    --to=david.weinehall@linux.intel.com \
    --cc=intel-gfx@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