From patchwork Wed Mar 2 16:02:30 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Weinehall X-Patchwork-Id: 8483041 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id D678B9F372 for ; Wed, 2 Mar 2016 16:02:47 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EF7E62037C for ; Wed, 2 Mar 2016 16:02:46 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 0B8CF200E8 for ; Wed, 2 Mar 2016 16:02:45 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 62D196E8A4; Wed, 2 Mar 2016 16:02:44 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id AD1956E8D1 for ; Wed, 2 Mar 2016 16:02:38 +0000 (UTC) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP; 02 Mar 2016 08:02:38 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.22,529,1449561600"; d="scan'208";a="928041068" Received: from dweineha-mobl3.fi.intel.com ([10.237.72.54]) by fmsmga002.fm.intel.com with ESMTP; 02 Mar 2016 08:02:37 -0800 From: David Weinehall To: intel-gfx@lists.freedesktop.org Date: Wed, 2 Mar 2016 18:02:30 +0200 Message-Id: <1456934550-25305-1-git-send-email-david.weinehall@linux.intel.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1456924317-23525-1-git-send-email-david.weinehall@linux.intel.com> References: <1456924317-23525-1-git-send-email-david.weinehall@linux.intel.com> Subject: [Intel-gfx] [PATCH i-g-t v3] tests/pm_rpm: Fix CRASH on machines that lack LLC X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 and uses I915_CACHING_NONE instead. v2: Various improvements based on feedback from Chris Wilson v3: Fix incorrect Signed-off-by: line Signed-off-by: David Weinehall --- tests/pm_rpm.c | 33 +++++++++++---------------------- 1 file changed, 11 insertions(+), 22 deletions(-) diff --git a/tests/pm_rpm.c b/tests/pm_rpm.c index 2aa6c1018aa2..add8e2eb457f 100644 --- a/tests/pm_rpm.c +++ b/tests/pm_rpm.c @@ -1800,7 +1800,7 @@ static void pm_test_caching(void) uint32_t handle; uint8_t *gem_buf; - uint32_t i, got_caching; + uint32_t i; uint32_t gtt_obj_max_size = (16 * 1024); uint32_t cache_levels[3] = { I915_CACHING_NONE, @@ -1808,42 +1808,31 @@ static void pm_test_caching(void) I915_CACHING_DISPLAY, /* eDRAM caching */ }; + disable_all_screens(&ms_data); handle = gem_create(drm_fd, gtt_obj_max_size); gem_buf = gem_mmap__gtt(drm_fd, handle, gtt_obj_max_size, PROT_WRITE); for (i = 0; i < ARRAY_SIZE(cache_levels); i++) { - memset(gem_buf, 16 << i, gtt_obj_max_size); + igt_assert(wait_for_suspended()); - disable_all_screens_and_wait(&ms_data); + memset(gem_buf, 16 << i, gtt_obj_max_size); igt_debug("Setting cache level %u\n", cache_levels[i]); - gem_set_caching(drm_fd, handle, cache_levels[i]); - - got_caching = gem_get_caching(drm_fd, handle); - - igt_debug("Got back %u\n", got_caching); - - /* - * Allow fall-back to CACHING_NONE in case the platform does - * not support it. - */ - if (cache_levels[i] == I915_CACHING_DISPLAY) - igt_assert(got_caching == I915_CACHING_NONE || - got_caching == I915_CACHING_DISPLAY); - else - igt_assert(got_caching == cache_levels[i]); - - enable_one_screen_and_wait(&ms_data); + /* If we lack an LLC cache we use I915_CACHING_NONE instead */ + if (cache_levels[i] == I915_CACHING_CACHED && + !gem_has_llc(drm_fd)) { + igt_debug("!gem_has_llc(); using I915_CACHING_NONE\n"); + gem_set_caching(drm_fd, handle, I915_CACHING_NONE); + } else + gem_set_caching(drm_fd, handle, cache_levels[i]); } igt_assert(munmap(gem_buf, gtt_obj_max_size) == 0); gem_close(drm_fd, handle); } - - static void fences_subtest(bool dpms) { int i;