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 9CFB0C4828F for ; Fri, 9 Feb 2024 17:45:54 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5DE9910F39B; Fri, 9 Feb 2024 17:45:54 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="PpTY2hPr"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5325510F86E for ; Fri, 9 Feb 2024 17:45:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1707500753; x=1739036753; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=/NKjWfqJMSgT9n2vJNT2aCwp8VOQ39Y0nv9agdzqnCo=; b=PpTY2hPrs0gzqaK38Tss/DtIFkaLIs92vfTrLiGrX53GMxRAzpfJCUFS OnjmobQWOgshsMREfbNS3Ub5hrIW7hj9iT9RA8PS2mHsn3tM+Dx5VACou 3e6FUrO1nOiMHQyTNCm13bSCIDDRKdYnWpT/BGQmP4J4Yhk5sCkaKOGUz zhpFYobLK3KDGs/J68SBMGW+gqNcJ1mVwayQ38B4VRlRsxY2DHOtbIfvU 7tCuiLb5UyhVyPDZ9ddjCR/vwUqaNjKYz9jN6LD8dlG8oxmi47J26+Own lY6sU2feqcUikaURgeBYasO8yJN4vJ6xRq1A858FGmC44gVHWfd0N0eY6 A==; X-IronPort-AV: E=McAfee;i="6600,9927,10979"; a="395898516" X-IronPort-AV: E=Sophos;i="6.05,257,1701158400"; d="scan'208";a="395898516" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Feb 2024 09:45:51 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10979"; a="825191386" X-IronPort-AV: E=Sophos;i="6.05,257,1701158400"; d="scan'208";a="825191386" Received: from guc-pnp-dev-box-1.fm.intel.com ([10.1.27.7]) by orsmga001.jf.intel.com with ESMTP; 09 Feb 2024 09:45:50 -0800 From: Zhanjun Dong To: intel-xe@lists.freedesktop.org Cc: Zhanjun Dong Subject: [PATCH v9 1/1] drm/xe: Add helper macro to loop each dss Date: Fri, 9 Feb 2024 09:45:48 -0800 Message-Id: <20240209174548.19389-2-zhanjun.dong@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240209174548.19389-1-zhanjun.dong@intel.com> References: <20240209174548.19389-1-zhanjun.dong@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: intel-xe@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Xe graphics driver List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" Add helper macro to loop each dss. This is a precursor patch to allow for easier iteration through MCR registers and other per-DSS uses. Signed-off-by: Zhanjun Dong --- drivers/gpu/drm/xe/xe_gt_mcr.c | 32 ++++++++++++++++++++++++++++- drivers/gpu/drm/xe/xe_gt_mcr.h | 13 ++++++++++++ drivers/gpu/drm/xe/xe_gt_topology.c | 31 +++++++++++++++++++++++++--- drivers/gpu/drm/xe/xe_gt_topology.h | 1 + drivers/gpu/drm/xe/xe_gt_types.h | 2 ++ 5 files changed, 75 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_gt_mcr.c b/drivers/gpu/drm/xe/xe_gt_mcr.c index 8546cd3cc50d..44163fe8c7b9 100644 --- a/drivers/gpu/drm/xe/xe_gt_mcr.c +++ b/drivers/gpu/drm/xe/xe_gt_mcr.c @@ -6,6 +6,7 @@ #include "xe_gt_mcr.h" #include "regs/xe_gt_regs.h" +#include "xe_assert.h" #include "xe_gt.h" #include "xe_gt_topology.h" #include "xe_gt_types.h" @@ -291,11 +292,40 @@ static void init_steering_mslice(struct xe_gt *gt) gt->steering[LNCF].instance_target = 0; /* unused */ } +static int get_dss_per_group(struct xe_gt *gt) +{ + return gt_to_xe(gt)->info.platform == XE_PVC ? 8 : 4; +} + +/** + * xe_gt_mcr_get_dss_steering - returns the group/instance steering for a DSS + * @gt: GT structure + * @dss: DSS ID to obtain steering for + * @group: pointer to storage for steering group ID + * @instance: pointer to storage for steering instance ID + * + * Returns the steering IDs (via the @group and @instance parameters) that + * correspond to a specific DSS ID. + */ +bool xe_gt_mcr_get_dss_steering(struct xe_gt *gt, unsigned int dss, unsigned int *group, + unsigned int *instance) +{ + int dss_per_grp; + + xe_gt_assert(gt, dss < XE_MAX_DSS_FUSE_BITS); + + dss_per_grp = get_dss_per_group(gt); + + *group = dss / dss_per_grp; + *instance = dss % dss_per_grp; + return true; +} + static void init_steering_dss(struct xe_gt *gt) { unsigned int dss = min(xe_dss_mask_group_ffs(gt->fuse_topo.g_dss_mask, 0, 0), xe_dss_mask_group_ffs(gt->fuse_topo.c_dss_mask, 0, 0)); - unsigned int dss_per_grp = gt_to_xe(gt)->info.platform == XE_PVC ? 8 : 4; + unsigned int dss_per_grp = get_dss_per_group(gt); gt->steering[DSS].group_target = dss / dss_per_grp; gt->steering[DSS].instance_target = dss % dss_per_grp; diff --git a/drivers/gpu/drm/xe/xe_gt_mcr.h b/drivers/gpu/drm/xe/xe_gt_mcr.h index 27ca1bc880a0..5b4e74da82a1 100644 --- a/drivers/gpu/drm/xe/xe_gt_mcr.h +++ b/drivers/gpu/drm/xe/xe_gt_mcr.h @@ -7,6 +7,7 @@ #define _XE_GT_MCR_H_ #include "regs/xe_reg_defs.h" +#include "xe_gt_topology.h" struct drm_printer; struct xe_gt; @@ -25,5 +26,17 @@ void xe_gt_mcr_multicast_write(struct xe_gt *gt, struct xe_reg_mcr mcr_reg, u32 value); void xe_gt_mcr_steering_dump(struct xe_gt *gt, struct drm_printer *p); +bool xe_gt_mcr_get_dss_steering(struct xe_gt *gt, unsigned int dss, unsigned int *group, + unsigned int *instance); + +/* + * Loop over each DSS and determine the group and instance IDs that + * should be used to steer MCR accesses toward this DSS. + */ +#define for_each_dss_steering(dss_, gt_, group_, instance_) \ + for (dss_ = xe_gt_topology_get_next_dss(gt, 0); \ + dss_ >= 0; \ + dss_ = xe_gt_topology_get_next_dss(gt, dss_ + 1)) \ + for_each_if(xe_gt_mcr_get_dss_steering(gt_, dss_, &(group_), &(instance_))) #endif /* _XE_GT_MCR_H_ */ diff --git a/drivers/gpu/drm/xe/xe_gt_topology.c b/drivers/gpu/drm/xe/xe_gt_topology.c index a8d7f272c30a..97c0a4b8fe40 100644 --- a/drivers/gpu/drm/xe/xe_gt_topology.c +++ b/drivers/gpu/drm/xe/xe_gt_topology.c @@ -11,9 +11,6 @@ #include "xe_gt.h" #include "xe_mmio.h" -#define XE_MAX_DSS_FUSE_BITS (32 * XE_MAX_DSS_FUSE_REGS) -#define XE_MAX_EU_FUSE_BITS (32 * XE_MAX_EU_FUSE_REGS) - static void load_dss_mask(struct xe_gt *gt, xe_dss_mask_t mask, int numregs, ...) { @@ -167,3 +164,31 @@ bool xe_gt_topology_has_dss_in_quadrant(struct xe_gt *gt, int quad) return quad_first < (quad + 1) * dss_per_quad; } + +/** + * xe_gt_topology_get_next_dss - returns the next DSS id from a start position + * @gt: GT structure + * @from: An index to start search form + * + * Search from this GT's DSS-fuses-topology and return the DSS-ID of the + * next valid DSS instance after DSS-ID 'from'. Depending on the platform + * construction, DSS instances could be for geometry (RENDER engine) or + * compute (COMPUTE engine). However, all current platforms that have + * both engines have the same instances thus we can combine both masks + * internally before performing this operation. + * + * Return -1 if not found since given "from" position. + */ +int xe_gt_topology_get_next_dss(struct xe_gt *gt, int from) +{ + xe_dss_mask_t all_dss; + unsigned long next; + + bitmap_or(all_dss, gt->fuse_topo.g_dss_mask, gt->fuse_topo.c_dss_mask, + XE_MAX_DSS_FUSE_BITS); + + next = find_next_bit(all_dss, XE_MAX_DSS_FUSE_BITS, from); + if (next == XE_MAX_DSS_FUSE_BITS) + return -1; + return next; +} diff --git a/drivers/gpu/drm/xe/xe_gt_topology.h b/drivers/gpu/drm/xe/xe_gt_topology.h index d1b54fb52ea6..44bd8a58f9ce 100644 --- a/drivers/gpu/drm/xe/xe_gt_topology.h +++ b/drivers/gpu/drm/xe/xe_gt_topology.h @@ -21,5 +21,6 @@ bool xe_dss_mask_empty(const xe_dss_mask_t mask); bool xe_gt_topology_has_dss_in_quadrant(struct xe_gt *gt, int quad); +int xe_gt_topology_get_next_dss(struct xe_gt *gt, int from); #endif /* _XE_GT_TOPOLOGY_H_ */ diff --git a/drivers/gpu/drm/xe/xe_gt_types.h b/drivers/gpu/drm/xe/xe_gt_types.h index 70c615dd1498..b926606edb38 100644 --- a/drivers/gpu/drm/xe/xe_gt_types.h +++ b/drivers/gpu/drm/xe/xe_gt_types.h @@ -25,7 +25,9 @@ enum xe_gt_type { }; #define XE_MAX_DSS_FUSE_REGS 3 +#define XE_MAX_DSS_FUSE_BITS (32 * XE_MAX_DSS_FUSE_REGS) #define XE_MAX_EU_FUSE_REGS 1 +#define XE_MAX_EU_FUSE_BITS (32 * XE_MAX_EU_FUSE_REGS) typedef unsigned long xe_dss_mask_t[BITS_TO_LONGS(32 * XE_MAX_DSS_FUSE_REGS)]; typedef unsigned long xe_eu_mask_t[BITS_TO_LONGS(32 * XE_MAX_EU_FUSE_REGS)]; -- 2.34.1