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 734B3C3600E for ; Wed, 26 Mar 2025 08:06:20 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3579110E65C; Wed, 26 Mar 2025 08:06:20 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="GGXMRr5u"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.11]) by gabe.freedesktop.org (Postfix) with ESMTPS id 32FAC10E663 for ; Wed, 26 Mar 2025 08:06:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1742976375; x=1774512375; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=mq+zpe3KyoXWsJ2xYSObywQzysDm8jVpFloVYTapzJ0=; b=GGXMRr5uhB+iQ14gvgGqa1EmsC5mV5raVgfpQDVrAvBYXn4Gum/kCVoZ 4XpB82TXWsrbt225EouV0S7z/+ri0TVlJYxJUcMdlmGB1PLnB24hCrJvW XwIl7Hc+09MkmJZuC9M4cY73SCahqJiz7geaaU1zRXQMxc616ED2EBZ/k sR+kKjscnYFLHiQ7YHQTFE/wIeCNYRLEDpH0a93xTFmMb9xj6ox+sy0BW XEHYuR6xUeN1QpMYUbkBuS0QtbZhu+teY39PT+RximdUqH3iDdWbOXCHB i0smdJQ26bv+IC20XIRmSzD41psE4aXOuxhAFffjoS6A/uCwzOV0OUY3Q w==; X-CSE-ConnectionGUID: 3CE2jXe1T8q+kEAqRJoNkQ== X-CSE-MsgGUID: VlNu9FcLR+mNGUB/luXidQ== X-IronPort-AV: E=McAfee;i="6700,10204,11384"; a="54910926" X-IronPort-AV: E=Sophos;i="6.14,277,1736841600"; d="scan'208";a="54910926" Received: from fmviesa009.fm.intel.com ([10.60.135.149]) by fmvoesa105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Mar 2025 01:06:15 -0700 X-CSE-ConnectionGUID: s/5DZKeCQ1Ccju/+C1lw9Q== X-CSE-MsgGUID: DHVVNyLATbqN/KL61lLe0A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,277,1736841600"; d="scan'208";a="125484676" Received: from ncintean-mobl1.ger.corp.intel.com (HELO fedora..) ([10.245.246.202]) by fmviesa009-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Mar 2025 01:06:13 -0700 From: =?UTF-8?q?Thomas=20Hellstr=C3=B6m?= To: intel-xe@lists.freedesktop.org Cc: =?UTF-8?q?Thomas=20Hellstr=C3=B6m?= , Matthew Brost , himal.prasad.ghimiray@intel.com, Matthew Auld Subject: [PATCH v4 4/5] drm/xe/migrate: Allow xe_migrate_vram() also on non-pagefault capable devices Date: Wed, 26 Mar 2025 09:05:50 +0100 Message-ID: <20250326080551.40201-5-thomas.hellstrom@linux.intel.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250326080551.40201-1-thomas.hellstrom@linux.intel.com> References: <20250326080551.40201-1-thomas.hellstrom@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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" The drm_pagemap functionality does not depend on the device having recoverable pagefaults available. So allow xe_migrate_vram() also for such devices. Even if this will have little use in practice, it's beneficial for testin multi-device SVM, since a memory provider could be a non-pagefault capable gpu. Signed-off-by: Thomas Hellström Reviewed-by: Matthew Brost --- drivers/gpu/drm/xe/xe_migrate.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_migrate.c b/drivers/gpu/drm/xe/xe_migrate.c index d364c9f458e7..f17234533504 100644 --- a/drivers/gpu/drm/xe/xe_migrate.c +++ b/drivers/gpu/drm/xe/xe_migrate.c @@ -1609,6 +1609,7 @@ static struct dma_fence *xe_migrate_vram(struct xe_migrate *m, { struct xe_gt *gt = m->tile->primary_gt; struct xe_device *xe = gt_to_xe(gt); + bool use_usm_batch = xe->info.has_usm; struct dma_fence *fence = NULL; u32 batch_size = 2; u64 src_L0_ofs, dst_L0_ofs; @@ -1625,7 +1626,7 @@ static struct dma_fence *xe_migrate_vram(struct xe_migrate *m, batch_size += pte_update_cmd_size(round_update_size); batch_size += EMIT_COPY_DW; - bb = xe_bb_new(gt, batch_size, true); + bb = xe_bb_new(gt, batch_size, use_usm_batch); if (IS_ERR(bb)) { err = PTR_ERR(bb); return ERR_PTR(err); @@ -1650,7 +1651,7 @@ static struct dma_fence *xe_migrate_vram(struct xe_migrate *m, XE_PAGE_SIZE); job = xe_bb_create_migration_job(m->q, bb, - xe_migrate_batch_base(m, true), + xe_migrate_batch_base(m, use_usm_batch), update_idx); if (IS_ERR(job)) { err = PTR_ERR(job); -- 2.48.1