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 28040D637A5 for ; Wed, 17 Dec 2025 08:07:36 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B619C10EBE1; Wed, 17 Dec 2025 08:07:35 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="deFEktwr"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.12]) by gabe.freedesktop.org (Postfix) with ESMTPS id 53BBB10EBD0 for ; Wed, 17 Dec 2025 08:07:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1765958855; x=1797494855; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=k7DFZD5ba4uctQ9MOetO00wwFWlxkoWWZji9r59TgVg=; b=deFEktwrw1l5fockMnEZjyWUP+OjodB3rWk7rKuhtSjnyC3fdnLglQyX m7qtTkrFZrmlR+33yS2Fl6I0VtM2pclFrtNlmLro7X4SBeLUp7IPlC6A0 G6FESIs4hWURhdFB39SG7+o8yCWQGzp5dcDzSafk6vG7HBShkL4d+qjSJ oUKxAgKAUzJ+JTyJAEISCPu9wn1YDoiqZA+1fXZeGcV3ny9gl/TTwHglv zUOpgh3s0SDsKG5SenRAgGzLh8JWPcEEcKOki9NNDKeM6dy0udGQNsF9l BhU/rSgOvMPB/aYeU/ws/Z47u4qF/te9mj5SElM1/xhspPETpzsSPa0QM w==; X-CSE-ConnectionGUID: UJPEx7eCTsGwpW+jVRvr5A== X-CSE-MsgGUID: Bm9zp6SAR1WAKs+Q6ewgiw== X-IronPort-AV: E=McAfee;i="6800,10657,11644"; a="71747851" X-IronPort-AV: E=Sophos;i="6.21,155,1763452800"; d="scan'208";a="71747851" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by fmvoesa106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Dec 2025 00:07:34 -0800 X-CSE-ConnectionGUID: oTZC8RVuSe+/0x05m9O/6w== X-CSE-MsgGUID: WseGlocJR/+5qX8JSp26tA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.21,155,1763452800"; d="scan'208";a="197857459" Received: from dut6304bmgfrd.fm.intel.com ([10.36.21.42]) by fmviesa007.fm.intel.com with ESMTP; 17 Dec 2025 00:07:34 -0800 From: Xin Wang To: igt-dev@lists.freedesktop.org Cc: alex.zuo@intel.com, shuicheng.lin@intel.com, stuart.summers@intel.com, kamil.konieczny@intel.com, matthew.d.roper@intel.com, ravi.kumar.vodapalli@intel.com, Xin Wang , Matthew Auld Subject: [PATCH v6 2/2] tests/intel/xe_pat: sync with Xe PAT debugfs parser Date: Wed, 17 Dec 2025 08:07:28 +0000 Message-ID: <20251217080732.266257-3-x.wang@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251217080732.266257-1-x.wang@intel.com> References: <20251217080732.266257-1-x.wang@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" Pull in the Xe PAT table parsed by lib/intel_pat so Xe2+ tests use the driver-provided entries instead of hard-coded reservations. CC: Matthew Auld Signed-off-by: Xin Wang Reviewed-by: Matthew Auld --- tests/intel/xe_pat.c | 37 +++++++++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/tests/intel/xe_pat.c b/tests/intel/xe_pat.c index 193b63a1d..7b8e4801e 100644 --- a/tests/intel/xe_pat.c +++ b/tests/intel/xe_pat.c @@ -77,6 +77,18 @@ static void userptr_coh_none(int fd) xe_vm_destroy(fd, vm); } +#define BITS_TO(n) (n >= sizeof(long) * 8 ? ~0 : (1UL << (n)) - 1) +#define BITMASK(high, low) (uint32_t)(BITS_TO(high+1) & ~BITS_TO(low)) +#define FIELD_GET(val, high, low) (((val) & (BITMASK(high, low))) >> (low)) +#define FIELD_GET_BIT(val, n) FIELD_GET(val, n, n) + +#define XE_NO_PROMOTE(val) FIELD_GET_BIT(val, 10) +#define XE_COMP_EN(val) FIELD_GET_BIT(val, 9) +#define XE_L3_CLOS(val) FIELD_GET(val, 7, 6) +#define XE_L3_POLICY(val) FIELD_GET(val, 5, 4) +#define XE_L4_POLICY(val) FIELD_GET(val, 3, 2) +#define XE_COH_MODE(val) FIELD_GET(val, 1, 0) + /** * SUBTEST: pat-index-all * Test category: functionality test @@ -86,6 +98,7 @@ static void pat_index_all(int fd) { uint16_t dev_id = intel_get_drm_devid(fd); size_t size = xe_get_default_alignment(fd); + struct xe_pat_entry xe_pat_table[XE_PAT_MAX_ENTRIES] = {0}; uint32_t vm, bo; uint8_t pat_index; @@ -114,10 +127,30 @@ static void pat_index_all(int fd) igt_assert(intel_get_max_pat_index(fd)); + if (intel_graphics_ver(dev_id) >= IP_VER(20, 0)) { + /* Get the Xe PAT software configuration from the cached xe_dev structure */ + uint8_t parsed = xe_get_pat_entries(fd, xe_pat_table); + for (int i = 0; i < parsed; i++) { + uint32_t pat = xe_pat_table[i].pat; + igt_debug("PAT[%2d] = [ %u, %u, %u, %u, %u, %u] (%#8x)%s\n", i, + XE_NO_PROMOTE(pat), + XE_COMP_EN(pat), + XE_L3_CLOS(pat), + XE_L3_POLICY(pat), + XE_L4_POLICY(pat), + XE_COH_MODE(pat), + pat, + xe_pat_table[i].rsvd ? " *" : ""); + } + } + for (pat_index = 0; pat_index <= intel_get_max_pat_index(fd); pat_index++) { - if (intel_get_device_info(dev_id)->graphics_ver >= 20 && - pat_index >= 16 && pat_index <= 19) { /* hw reserved */ + + bool hw_reserved = intel_graphics_ver(dev_id) >= IP_VER(20, 0) ? + xe_pat_table[pat_index].rsvd : false; + + if (hw_reserved) { igt_assert_eq(__xe_vm_bind(fd, vm, 0, bo, 0, 0x40000, size, DRM_XE_VM_BIND_OP_MAP, 0, NULL, 0, 0, pat_index, 0), -- 2.43.0