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 52FC1C2BA15 for ; Fri, 14 Jun 2024 21:47:48 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7BAEF10E2E0; Fri, 14 Jun 2024 21:47:47 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="MyREnC4O"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) by gabe.freedesktop.org (Postfix) with ESMTPS id C57D010E2C4 for ; Fri, 14 Jun 2024 21:47:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1718401661; x=1749937661; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=F8XzhsW+axUkSOtXCjyU4hjRCzlb8ljw7RyhYxIZHjQ=; b=MyREnC4OQ/eDheKZ7u1X0gzi7DJmZtPHCACAWPsp7RECwb4hwNUf6vre DnMEP9jLjC3EPUuX64tawcByqw3dlrP3Hj9PUS9FHP3KpV2ylTduPuleB SM+a9g4LXVddybZzBiwJjyVeop1+X9Ep7y656UYdBQ2z/z+GODKQYIFaR FctE7lv++KsNYjYDxFyd0tfxcCcIFlPpsaD8mRP+7wsETseegGV6q6UGH MgAmPN07sDZdAFNjtT4DXx+GdMBZWzqlhZmS2X2R5C94WP8CAKaagftHz B6tfDRd6tJhmqirLSCtsflj/mDf++d0TIfm4XYm1Bx0mu0RIVceqiMdUH g==; X-CSE-ConnectionGUID: e74Fv7RoQNiAgqekaUGyMg== X-CSE-MsgGUID: /GL2VL+uRoW7rmq1EtSADg== X-IronPort-AV: E=McAfee;i="6700,10204,11103"; a="25886605" X-IronPort-AV: E=Sophos;i="6.08,238,1712646000"; d="scan'208";a="25886605" Received: from orviesa005.jf.intel.com ([10.64.159.145]) by orvoesa103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Jun 2024 14:47:28 -0700 X-CSE-ConnectionGUID: ckJoiNhsSZ6aRD9UD/zcbw== X-CSE-MsgGUID: p9igX6ZHQ/OpS40NXTwHuQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,238,1712646000"; d="scan'208";a="45572419" Received: from szeng-desk.jf.intel.com ([10.165.21.149]) by orviesa005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Jun 2024 14:47:28 -0700 From: Oak Zeng To: intel-xe@lists.freedesktop.org Subject: [CI 25/44] drm/xe: Add dma_addr res cursor Date: Fri, 14 Jun 2024 17:57:58 -0400 Message-Id: <20240614215817.1097633-25-oak.zeng@intel.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20240614215817.1097633-1-oak.zeng@intel.com> References: <20240614215817.1097633-1-oak.zeng@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" From: Matthew Brost Add dma_addr resource cursor. Signed-off-by: Matthew Brost --- drivers/gpu/drm/xe/xe_res_cursor.h | 50 +++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/xe/xe_res_cursor.h b/drivers/gpu/drm/xe/xe_res_cursor.h index 655af89b31a9..b17b3375f6d9 100644 --- a/drivers/gpu/drm/xe/xe_res_cursor.h +++ b/drivers/gpu/drm/xe/xe_res_cursor.h @@ -44,7 +44,9 @@ struct xe_res_cursor { u64 remaining; void *node; u32 mem_type; + unsigned int order; struct scatterlist *sgl; + const dma_addr_t *dma_addr; struct drm_buddy *mm; }; @@ -71,6 +73,7 @@ static inline void xe_res_first(struct ttm_resource *res, struct xe_res_cursor *cur) { cur->sgl = NULL; + cur->dma_addr = NULL; if (!res) goto fallback; @@ -161,11 +164,43 @@ static inline void xe_res_first_sg(const struct sg_table *sg, cur->start = start; cur->remaining = size; cur->size = 0; + cur->dma_addr = NULL; cur->sgl = sg->sgl; cur->mem_type = XE_PL_TT; __xe_res_sg_next(cur); } +/** + * xe_res_first_dma - initialize a xe_res_cursor with dma_addr array + * + * @dma_addr: dma_addr array to walk + * @start: Start of the range + * @size: Size of the range + * @order: Order of dma mapping. i.e. PAGE_SIZE << order is mapping size + * @cur: cursor object to initialize + * + * Start walking over the range of allocations between @start and @size. + */ +static inline void xe_res_first_dma(const dma_addr_t *dma_addr, + u64 start, u64 size, + unsigned int order, + struct xe_res_cursor *cur) +{ + XE_WARN_ON(start); + XE_WARN_ON(!dma_addr); + XE_WARN_ON(!IS_ALIGNED(start, PAGE_SIZE) || + !IS_ALIGNED(size, PAGE_SIZE)); + + cur->node = NULL; + cur->start = start; + cur->remaining = size; + cur->size = PAGE_SIZE << order; + cur->dma_addr = dma_addr; + cur->order = order; + cur->sgl = NULL; + cur->mem_type = XE_PL_TT; +} + /** * xe_res_next - advance the cursor * @@ -192,6 +227,13 @@ static inline void xe_res_next(struct xe_res_cursor *cur, u64 size) return; } + if (cur->dma_addr) { + cur->size = (PAGE_SIZE << cur->order) - + (size - cur->size); + cur->start += size; + return; + } + if (cur->sgl) { cur->start += size; __xe_res_sg_next(cur); @@ -233,6 +275,12 @@ static inline void xe_res_next(struct xe_res_cursor *cur, u64 size) */ static inline u64 xe_res_dma(const struct xe_res_cursor *cur) { - return cur->sgl ? sg_dma_address(cur->sgl) + cur->start : cur->start; + if (cur->dma_addr) + return cur->dma_addr[cur->start >> (PAGE_SHIFT + cur->order)] + + (cur->start & ((PAGE_SIZE << cur->order) - 1)); + else if (cur->sgl) + return sg_dma_address(cur->sgl) + cur->start; + else + return cur->start; } #endif -- 2.26.3