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 ECA2BC10F1A for ; Thu, 25 Apr 2024 04:55:16 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C032611A0E7; Thu, 25 Apr 2024 04:55:16 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="RPNlNDH1"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.9]) by gabe.freedesktop.org (Postfix) with ESMTPS id D71BB11A0E5 for ; Thu, 25 Apr 2024 04:54:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1714020884; x=1745556884; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=7SUNmmW0+XHMFfbmxMCaZHSRNppSyTqLk1od2IuZmAE=; b=RPNlNDH1ZOYGoxOOwhfJC2ZC/bmjn5hDulJRTpYl1YPTQ2Gsu3OYv13Q N13o3KpToxByN3uA1RmNCpDNY6avp3loEoBn4hKMNG+DLWxr9bDuGZh7D QQK2efJuqQE3wvJ6VmgfCpv8OVjwDQ546/9pnwi6+MQIe3BGvIVZvGCl/ P61O91ClggfjFVxibGBv35HTvWCIttOMYLUExQh5j6dmB3np2l3V07G82 Dg17/k4kOsDDOR4WdTGYFqO54fhFC38haz1UTP5dFkZcbD5W66IwwoS8u LS1TV17GBo6UGXT6CPHCBY1YABX/DwQHaz7YM+/sjXSH0na8r4du51pzn w==; X-CSE-ConnectionGUID: a+ut5hpxSi2hTvWNjFKDLA== X-CSE-MsgGUID: 2cOxaeK8RXek/SBCoIbLPA== X-IronPort-AV: E=McAfee;i="6600,9927,11054"; a="20374873" X-IronPort-AV: E=Sophos;i="6.07,228,1708416000"; d="scan'208";a="20374873" Received: from fmviesa006.fm.intel.com ([10.60.135.146]) by fmvoesa103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Apr 2024 21:54:43 -0700 X-CSE-ConnectionGUID: k01EObOaQQquV0GADdOfjg== X-CSE-MsgGUID: M3VJpbxORHyyCrp7pJpS/Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,228,1708416000"; d="scan'208";a="24996482" Received: from lstrano-desk.jf.intel.com ([10.54.39.91]) by fmviesa006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Apr 2024 21:54:43 -0700 From: Matthew Brost To: Cc: Matthew Brost , Oak Zeng Subject: [PATCH v3 03/13] drm/xe: Move migrate to prefetch to op_lock_and_prep function Date: Wed, 24 Apr 2024 21:55:03 -0700 Message-Id: <20240425045513.1913039-4-matthew.brost@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240425045513.1913039-1-matthew.brost@intel.com> References: <20240425045513.1913039-1-matthew.brost@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" All non-binding operations in VM bind IOCTL should be in the lock and prepare step rather than the execution step. Move prefetch to conform to this pattern. v2: - Rebase - New function names (Oak) - Update stale comment (Oak) Cc: Oak Zeng Signed-off-by: Matthew Brost Reviewed-by: Oak Zeng --- drivers/gpu/drm/xe/xe_vm.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_vm.c b/drivers/gpu/drm/xe/xe_vm.c index d889e9c422fe..c0d60f29667b 100644 --- a/drivers/gpu/drm/xe/xe_vm.c +++ b/drivers/gpu/drm/xe/xe_vm.c @@ -1921,20 +1921,10 @@ static const u32 region_to_mem_type[] = { static struct dma_fence * xe_vm_prefetch(struct xe_vm *vm, struct xe_vma *vma, - struct xe_exec_queue *q, u32 region, - struct xe_sync_entry *syncs, u32 num_syncs, - bool first_op, bool last_op) + struct xe_exec_queue *q, struct xe_sync_entry *syncs, + u32 num_syncs, bool first_op, bool last_op) { struct xe_exec_queue *wait_exec_queue = to_wait_exec_queue(vm, q); - int err; - - xe_assert(vm->xe, region < ARRAY_SIZE(region_to_mem_type)); - - if (!xe_vma_has_no_bo(vma)) { - err = xe_bo_migrate(xe_vma_bo(vma), region_to_mem_type[region]); - if (err) - return ERR_PTR(err); - } if (vma->tile_mask != (vma->tile_present & ~vma->tile_invalidated)) { return xe_vm_bind(vm, vma, q, xe_vma_bo(vma), syncs, num_syncs, @@ -2474,8 +2464,7 @@ static struct dma_fence *op_execute(struct xe_vm *vm, struct xe_vma *vma, op->flags & XE_VMA_OP_LAST); break; case DRM_GPUVA_OP_PREFETCH: - fence = xe_vm_prefetch(vm, vma, op->q, op->prefetch.region, - op->syncs, op->num_syncs, + fence = xe_vm_prefetch(vm, vma, op->q, op->syncs, op->num_syncs, op->flags & XE_VMA_OP_FIRST, op->flags & XE_VMA_OP_LAST); break; @@ -2706,9 +2695,20 @@ static int op_lock_and_prep(struct drm_exec *exec, struct xe_vm *vm, false); break; case DRM_GPUVA_OP_PREFETCH: + { + struct xe_vma *vma = gpuva_to_vma(op->base.prefetch.va); + u32 region = op->prefetch.region; + + xe_assert(vm->xe, region <= ARRAY_SIZE(region_to_mem_type)); + err = vma_lock_and_validate(exec, - gpuva_to_vma(op->base.prefetch.va), true); + gpuva_to_vma(op->base.prefetch.va), + false); + if (!err && !xe_vma_has_no_bo(vma)) + err = xe_bo_migrate(xe_vma_bo(vma), + region_to_mem_type[region]); break; + } default: drm_warn(&vm->xe->drm, "NOT POSSIBLE"); } -- 2.34.1