From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8A32CC36002 for ; Sun, 6 Apr 2025 18:16:23 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0E51A10E059; Sun, 6 Apr 2025 18:16:23 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="igAJXa/c"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.10]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6D27D10E06D for ; Sun, 6 Apr 2025 18:16:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1743963382; x=1775499382; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=qL6N4LqghvMqv2XJxl9ZAU11ntnsQJaoM3bsJl7DBSw=; b=igAJXa/cviKWkL/a6AoxdpInkjTJfl8dc0evE+0v2yW56Okh3E3aGnVZ e8AVc5G6Tia2sLKIx9HqGOVFrmYvIOtAg5XORyvihcLwtAOSLL2NE62Q2 vCiKYJsjW4W4xMwfsC7+FPl9cblQ4dxiKKYqkiwx99LVHq/QsKauQs6N4 hIOrejbmzMdIFJM2dTOnEHTniJezW+Tc0u4hO6maDVaIuhF3Rgk2xNulq WT+U5xFrHPyUsXwU/aHcMO261cIbcKABT9jmMt1PFAYmoD6GW8uU75dFm JutiTF1cajR/XsPUKt7Qv4d16WBrLkuKRn7nOCyj0Mp5669FG39tK1gJV Q==; X-CSE-ConnectionGUID: aJrkXAo3Rk+Q2Fu4yu2I2g== X-CSE-MsgGUID: vnK1kwIuSX2dFeVRIYGCsw== X-IronPort-AV: E=McAfee;i="6700,10204,11396"; a="56714398" X-IronPort-AV: E=Sophos;i="6.15,193,1739865600"; d="scan'208";a="56714398" Received: from fmviesa001.fm.intel.com ([10.60.135.141]) by fmvoesa104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Apr 2025 11:16:21 -0700 X-CSE-ConnectionGUID: f3KgIoAgQfKTFzuvyti18Q== X-CSE-MsgGUID: gWUUrP3JQK6th4PvTPHhsg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.15,193,1739865600"; d="scan'208";a="158728547" Received: from linux-tiger-lake-client-platform.iind.intel.com ([10.227.88.36]) by fmviesa001.fm.intel.com with ESMTP; 06 Apr 2025 11:16:20 -0700 From: Mohammed Thasleem To: igt-dev@lists.freedesktop.org Cc: imre.deak@intel.com, Mohammed Thasleem Subject: [PATCH i-g-t v4] tests/intel/kms_pm_dc: Remove PKGC10 dependency to validate DC6 Date: Sun, 6 Apr 2025 23:45:09 +0530 Message-Id: <20250406181509.80310-1-mohammed.thasleem@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250217170809.175276-1-mohammed.thasleem@intel.com> References: <20250217170809.175276-1-mohammed.thasleem@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: igt-dev@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development mailing list for IGT GPU Tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" DC6 counter was removed MTL onwards, so pkc10 counter is used to validated DC6 tests but with the new approach of kmd changes created DC6 debugfs entry counter to validated DC6 tests and removeing the existing PKGC10 code. v2: Update debugfs message. v3: Remove display version check. (Imre) Update commit subject and description. v4: Add find_counter() helper for dc6 counter value parsing. (Imre) Remove redundant code and update assert string. (Imre) Signed-off-by: Mohammed Thasleem --- tests/intel/kms_pm_dc.c | 74 ++++++++--------------------------------- 1 file changed, 14 insertions(+), 60 deletions(-) diff --git a/tests/intel/kms_pm_dc.c b/tests/intel/kms_pm_dc.c index 2491cd1f8..29f1903e1 100644 --- a/tests/intel/kms_pm_dc.c +++ b/tests/intel/kms_pm_dc.c @@ -273,6 +273,13 @@ static uint32_t get_dc_counter(char *dc_data) return ret; } +static char *find_counter(char *buf, const char *primary_count, + const char *allowed_count) +{ + char *str = strstr(buf, primary_count); + return str ? str : (allowed_count ? strstr(buf, allowed_count) : NULL); +} + static uint32_t read_dc_counter(uint32_t debugfs_fd, int dc_flag) { char buf[4096]; @@ -284,8 +291,8 @@ static uint32_t read_dc_counter(uint32_t debugfs_fd, int dc_flag) str = strstr(buf, "DC3 -> DC5 count"); igt_assert_f(str, "DC5 counter is not available\n"); } else if (dc_flag & CHECK_DC6) { - str = strstr(buf, "DC5 -> DC6 count"); - igt_assert_f(str, "DC6 counter is not available\n"); + str = find_counter(buf, "DC5 -> DC6 count", "DC5 -> DC6 allowed count"); + igt_assert_f(str, "No DC6 counter available\n"); } else if (dc_flag & CHECK_DC3CO) { str = strstr(buf, "DC3CO count"); igt_assert_f(str, "DC3CO counter is not available\n"); @@ -376,6 +383,7 @@ static void check_dc3co_with_videoplayback_like_load(data_t *data) static void require_dc_counter(int debugfs_fd, int dc_flag) { + char *str; char buf[4096]; igt_debugfs_simple_read(debugfs_fd, "i915_dmc_info", @@ -391,8 +399,8 @@ static void require_dc_counter(int debugfs_fd, int dc_flag) "DC5 counter is not available\n"); break; case CHECK_DC6: - igt_skip_on_f(!strstr(buf, "DC5 -> DC6 count"), - "DC6 counter is not available\n"); + str = find_counter(buf, "DC5 -> DC6 count", "DC5 -> DC6 allowed count"); + igt_skip_on_f(!str, "No DC6 counter available\n"); break; default: igt_assert_f(0, "Unknown DC counter %d\n", dc_flag); @@ -417,20 +425,6 @@ static void test_dc3co_vpb_simulation(data_t *data) cleanup_dc3co_fbs(data); } -static void psr_dpms(data_t *data, int mode) -{ - igt_output_t *output; - - for_each_connected_output(&data->display, output) { - drmModeConnectorPtr connector = output->config.connector; - - if (connector->connector_type == DRM_MODE_CONNECTOR_eDP) - continue; - - kmstest_set_connector_dpms(data->drm_fd, connector, mode); - } -} - static void test_dc5_retention_flops(data_t *data, int dc_flag) { uint32_t dc_counter_before_psr; @@ -721,40 +715,6 @@ static void test_deep_pkgc_state(data_t *data) igt_assert_f(pkgc_flag, "PKGC10 is not achieved.\n"); } -static void test_pkgc_state_dpms(data_t *data) -{ - unsigned int timeout_sec = 6; - unsigned int prev_value = 0, cur_value = 0; - - prev_value = read_pkgc_counter(data->debugfs_root_fd); - setup_dc_dpms(data); - dpms_off(data); - igt_wait((cur_value = read_pkgc_counter(data->debugfs_root_fd)) > prev_value, - timeout_sec * 1000, 100); - igt_assert_f(cur_value > prev_value, "PKGC10 is not achieved.\n"); - dpms_on(data); - cleanup_dc_dpms(data); -} - -static void test_pkgc_state_psr(data_t *data) -{ - unsigned int timeout_sec = 6; - unsigned int prev_value = 0, cur_value = 0; - - prev_value = read_pkgc_counter(data->debugfs_root_fd); - setup_output(data); - setup_primary(data); - igt_require(!psr_disabled_check(data->debugfs_fd)); - igt_assert(psr_wait_entry(data->debugfs_fd, data->op_psr_mode, NULL)); - psr_dpms(data, DRM_MODE_DPMS_OFF); - igt_wait((cur_value = read_pkgc_counter(data->debugfs_root_fd)) > prev_value, - timeout_sec * 1000, 100); - igt_assert_f(cur_value > prev_value, "PKGC10 is not achieved.\n"); - psr_sink_error_check(data->debugfs_fd, data->op_psr_mode, data->output); - psr_dpms(data, DRM_MODE_DPMS_ON); - cleanup_dc_psr(data); -} - static void kms_poll_state_restore(int sig) { int sysfs_fd; @@ -818,10 +778,7 @@ igt_main psr_enable(data.drm_fd, data.debugfs_fd, data.op_psr_mode, NULL); igt_require_f(igt_pm_pc8_plus_residencies_enabled(data.msr_fd), "PC8+ residencies not supported\n"); - if (intel_display_ver(data.devid) >= 14) - test_pkgc_state_psr(&data); - else - test_dc_state_psr(&data, CHECK_DC6); + test_dc_state_psr(&data, CHECK_DC6); } igt_describe("This test validates display engine entry to PKGC10 state " @@ -866,10 +823,7 @@ igt_main igt_subtest("dc6-dpms") { igt_require_f(igt_pm_pc8_plus_residencies_enabled(data.msr_fd), "PC8+ residencies not supported\n"); - if (intel_display_ver(data.devid) >= 14) - test_pkgc_state_dpms(&data); - else - test_dc_state_dpms(&data, CHECK_DC6); + test_dc_state_dpms(&data, CHECK_DC6); } -- 2.43.0