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 0D894C678D5 for ; Wed, 8 Mar 2023 12:30:36 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E00C810E11C; Wed, 8 Mar 2023 12:30:35 +0000 (UTC) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7906B10E10F for ; Wed, 8 Mar 2023 12:30:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1678278634; x=1709814634; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=rgguG7ee4ejYkxplv+ySnnexESTdAlDLelbnTvRjCx0=; b=fj/SiiXLjUd2elvCsf1PKYHNxU/NOv8RshRk0VLIXgTMpjj/o3yxtil/ nydKT1WJE4El3I+K5qqILf7vzBPbEIHvNbZydcSu0Z8m8FjslxiGVc0pS nCgBF3BlSV7hkkaP4xBc+udSiqhh31iD+7hugi0mg8CDZCQSRtUF2yXYD FeL6yqTetVF4TBPmnh6NmKZt47f0A8uDF7vS+NLulILRmKaAPntHV0ma1 gokVszHfh18P73UUAkF9UF10P7hryGawj5Brm+gbj3BXP/sX7nffENAOu FoDJCCSP4DaQPR5nD7o1QVx/cYnIPjU7CV4cUb5MLN/5ntEqSLLmYySel w==; X-IronPort-AV: E=McAfee;i="6500,9779,10642"; a="324452391" X-IronPort-AV: E=Sophos;i="5.98,243,1673942400"; d="scan'208";a="324452391" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Mar 2023 04:30:34 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10642"; a="670312599" X-IronPort-AV: E=Sophos;i="5.98,243,1673942400"; d="scan'208";a="670312599" Received: from jlenoir-mobl.ger.corp.intel.com (HELO mwauld-desk1.intel.com) ([10.252.24.168]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Mar 2023 04:30:33 -0800 From: Matthew Auld To: intel-xe@lists.freedesktop.org Date: Wed, 8 Mar 2023 12:30:10 +0000 Message-Id: <20230308123012.247091-5-matthew.auld@intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230308123012.247091-1-matthew.auld@intel.com> References: <20230308123012.247091-1-matthew.auld@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Intel-xe] [PATCH v3 4/6] drm/xe/buddy: remove the virtualized start 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: , Cc: Lucas De Marchi Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" Hopefully not needed anymore. We can add a .compatible() hook once we need to differentiate between mappable and non-mappable vram. If the allocation is not contiguous then the start value is kind of meaningless, so rather just mark as invalid. In upstream, TTM wants to eventually remove the ttm_resource.start usage. Signed-off-by: Matthew Auld Cc: Lucas De Marchi Reviewed-by: Maarten Lankhorst --- drivers/gpu/drm/xe/xe_bo.c | 6 ++++++ drivers/gpu/drm/xe/xe_ttm_vram_mgr.c | 29 ++++++++++++++-------------- 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_bo.c b/drivers/gpu/drm/xe/xe_bo.c index 73a7f2cd4ad8..346573f406c2 100644 --- a/drivers/gpu/drm/xe/xe_bo.c +++ b/drivers/gpu/drm/xe/xe_bo.c @@ -662,6 +662,12 @@ static int xe_bo_move(struct ttm_buffer_object *ttm_bo, bool evict, void *new_addr = gt->mem.vram.mapping + (new_mem->start << PAGE_SHIFT); + if (XE_WARN_ON(new_mem->start == XE_BO_INVALID_OFFSET)) { + ret = -EINVAL; + xe_device_mem_access_put(xe); + goto out; + } + XE_BUG_ON(new_mem->start != bo->placements->fpfn); diff --git a/drivers/gpu/drm/xe/xe_ttm_vram_mgr.c b/drivers/gpu/drm/xe/xe_ttm_vram_mgr.c index 643365b18bc7..e3ac8c6d3978 100644 --- a/drivers/gpu/drm/xe/xe_ttm_vram_mgr.c +++ b/drivers/gpu/drm/xe/xe_ttm_vram_mgr.c @@ -54,7 +54,6 @@ static int xe_ttm_vram_mgr_new(struct ttm_resource_manager *man, struct xe_ttm_vram_mgr_resource *vres; u64 size, remaining_size, lpfn, fpfn; struct drm_buddy *mm = &mgr->mm; - struct drm_buddy_block *block; unsigned long pages_per_block; int r; @@ -186,24 +185,24 @@ static int xe_ttm_vram_mgr_new(struct ttm_resource_manager *man, list_splice_tail(trim_list, &vres->blocks); } - vres->base.start = 0; - list_for_each_entry(block, &vres->blocks, link) { - unsigned long start; + if (!(vres->base.placement & TTM_PL_FLAG_CONTIGUOUS) && + xe_is_vram_mgr_blocks_contiguous(mm, &vres->blocks)) + vres->base.placement |= TTM_PL_FLAG_CONTIGUOUS; - start = drm_buddy_block_offset(block) + - drm_buddy_block_size(mm, block); - start >>= PAGE_SHIFT; + /* + * For some kernel objects we still rely on the start when io mapping + * the object. + */ + if (vres->base.placement & TTM_PL_FLAG_CONTIGUOUS) { + struct drm_buddy_block *block = list_first_entry(&vres->blocks, + typeof(*block), + link); - if (start > PFN_UP(vres->base.size)) - start -= PFN_UP(vres->base.size); - else - start = 0; - vres->base.start = max(vres->base.start, start); + vres->base.start = drm_buddy_block_offset(block) >> PAGE_SHIFT; + } else { + vres->base.start = XE_BO_INVALID_OFFSET; } - if (xe_is_vram_mgr_blocks_contiguous(mm, &vres->blocks)) - vres->base.placement |= TTM_PL_FLAG_CONTIGUOUS; - *res = &vres->base; return 0; -- 2.39.2