[Intel-gfx] [PATCH i-g-t] tests/pm_rpm: Fix CRASH on machines that lack LLC

David Weinehall david.weinehall at linux.intel.com
Wed Mar 2 13:11:57 UTC 2016


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 at 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



More information about the Intel-gfx mailing list