From patchwork Thu Feb 21 17:07:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Gupta, Anshuman" X-Patchwork-Id: 10824401 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EAA501575 for ; Thu, 21 Feb 2019 17:11:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CEA7531EDB for ; Thu, 21 Feb 2019 17:11:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C2D3831F6D; Thu, 21 Feb 2019 17:11:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 7EF0C31F71 for ; Thu, 21 Feb 2019 17:11:10 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8CC66897F9; Thu, 21 Feb 2019 17:11:08 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1BFEF897F0; Thu, 21 Feb 2019 17:11:05 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 Feb 2019 09:11:05 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,396,1544515200"; d="scan'208";a="126198614" Received: from genxfsim-desktop.iind.intel.com ([10.223.26.105]) by fmsmga008.fm.intel.com with ESMTP; 21 Feb 2019 09:11:03 -0800 From: Anshuman Gupta To: intel-gfx@lists.freedesktop.org, igt-dev@lists.freedesktop.org Date: Thu, 21 Feb 2019 22:37:57 +0530 Message-Id: <1550768878-20598-2-git-send-email-anshuman.gupta@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1550768878-20598-1-git-send-email-anshuman.gupta@intel.com> References: <1550768878-20598-1-git-send-email-anshuman.gupta@intel.com> Subject: [Intel-gfx] [PATCH i-g-t 1/2] tests/pm_rpm: Enable PC8+ residency test for ICL and GEN9. X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 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-Virus-Scanned: ClamAV using ClamSMTP Enabled has_pc8 global for ICL and Gen9. Added PC8+ residency test for display enabled case as well. Signed-off-by: Anshuman Gupta --- tests/pm_rpm.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/tests/pm_rpm.c b/tests/pm_rpm.c index be296f5..c84f199 100644 --- a/tests/pm_rpm.c +++ b/tests/pm_rpm.c @@ -686,7 +686,8 @@ static void setup_pc8(void) has_pc8 = false; /* Only Haswell supports the PC8 feature. */ - if (!IS_HASWELL(ms_data.devid) && !IS_BROADWELL(ms_data.devid)) + if (!IS_HASWELL(ms_data.devid) && !IS_BROADWELL(ms_data.devid) + && !IS_GEN9(ms_data.devid) && !IS_ICELAKE(ms_data.devid)) return; /* Make sure our Kernel supports MSR and the module is loaded. */ @@ -806,11 +807,15 @@ static void pc8_residency_subtest(void) igt_assert_f(pc8_plus_residency_changed(30), "Machine is not reaching PC8+ states, please check its " "configuration.\n"); - - /* Make sure PC8+ residencies stop! */ enable_one_screen(&ms_data); - igt_assert_f(!pc8_plus_residency_changed(10), + if (IS_HASWELL(ms_data.devid) && IS_BROADWELL(ms_data.devid)) { + /* Make sure PC8+ residencies stop! */ + igt_assert_f(!pc8_plus_residency_changed(10), + "PC8+ residency didn't stop with screen enabled.\n"); + } else { + igt_assert_f(pc8_plus_residency_changed(10), "PC8+ residency didn't stop with screen enabled.\n"); + } } static void modeset_subtest(enum screen_type type, int rounds, int wait_flags) From patchwork Thu Feb 21 17:07:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Gupta, Anshuman" X-Patchwork-Id: 10824399 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EE09E922 for ; Thu, 21 Feb 2019 17:11:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D389631F6D for ; Thu, 21 Feb 2019 17:11:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D1CDE31E34; Thu, 21 Feb 2019 17:11:09 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 7F5CC31F6D for ; Thu, 21 Feb 2019 17:11:09 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8AB69897F3; Thu, 21 Feb 2019 17:11:08 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by gabe.freedesktop.org (Postfix) with ESMTPS id D08C0897F0; Thu, 21 Feb 2019 17:11:06 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 Feb 2019 09:11:06 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,396,1544515200"; d="scan'208";a="126198640" Received: from genxfsim-desktop.iind.intel.com ([10.223.26.105]) by fmsmga008.fm.intel.com with ESMTP; 21 Feb 2019 09:11:05 -0800 From: Anshuman Gupta To: intel-gfx@lists.freedesktop.org, igt-dev@lists.freedesktop.org Date: Thu, 21 Feb 2019 22:37:58 +0530 Message-Id: <1550768878-20598-3-git-send-email-anshuman.gupta@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1550768878-20598-1-git-send-email-anshuman.gupta@intel.com> References: <1550768878-20598-1-git-send-email-anshuman.gupta@intel.com> Subject: [Intel-gfx] [PATCH i-g-t 2/2] tests/pm_rpm: Enable modeset-pc8-residency-stress for ICL and GEN9. X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 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-Virus-Scanned: ClamAV using ClamSMTP Do not assert failure if PC8 state achieved with display enabled. Signed-off-by: Anshuman Gupta --- tests/pm_rpm.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tests/pm_rpm.c b/tests/pm_rpm.c index c84f199..878b63b 100644 --- a/tests/pm_rpm.c +++ b/tests/pm_rpm.c @@ -846,8 +846,13 @@ static void modeset_subtest(enum screen_type type, int rounds, int wait_flags) igt_require(enable_one_screen_with_type(&ms_data, type)); if (wait_flags & WAIT_STATUS) igt_assert(wait_for_active()); - if (wait_flags & WAIT_PC8_RES) - igt_assert(!pc8_plus_residency_changed(5)); + if (wait_flags & WAIT_PC8_RES) { + if (IS_HASWELL(ms_data.devid) && + IS_BROADWELL(ms_data.devid)) + igt_assert(!pc8_plus_residency_changed(5)); + else + igt_assert(pc8_plus_residency_changed(5)); + } if (wait_flags & WAIT_EXTRA) sleep(5); }