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 9E40AC54E58 for ; Wed, 20 Mar 2024 18:40:22 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 641A410FEDC; Wed, 20 Mar 2024 18:40:22 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="eUiriHHH"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) by gabe.freedesktop.org (Postfix) with ESMTPS id 22A6010FED9 for ; Wed, 20 Mar 2024 18:40:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1710960007; x=1742496007; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=Qt7Jv1LOPZVyNL9tbH09nEdXf1kh0rvfhwmj++t5+CA=; b=eUiriHHHf2PQMhzExU5AaPVqPSm4hiaNInzCdJrOURMwfC89VZx7RQUw yJsgO91QjPifc4swQF5OauPYAYQB7ZT12V6h4hnc3E35Qfm8B+8iaAlVH gWr59IbeQWloHeY9seW0XJUZzTcyI41i6vxGuaZhmd8pk0bFHCrdEgUFT /GdlTRJ30wm3aQXollb4+RafO8/sDzoYIsU7M9OSJ8uX8Q5BNoPcFJmar rVAvo0PBeYBKgqM9j5fiCd7u8FLv43CA3oX1uKTnDGHjLuWNaV3SebNmJ KbWN2IIBdk/IzA8H26fAffc+b4j0ewWk7erp9p9x1fM8+MsNS+HACnV8e A==; X-IronPort-AV: E=McAfee;i="6600,9927,11019"; a="28382681" X-IronPort-AV: E=Sophos;i="6.07,140,1708416000"; d="scan'208";a="28382681" Received: from orviesa009.jf.intel.com ([10.64.159.149]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Mar 2024 11:33:22 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,140,1708416000"; d="scan'208";a="14262461" Received: from szeng-desk.jf.intel.com ([10.165.21.149]) by orviesa009-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Mar 2024 11:33:22 -0700 From: Oak Zeng To: intel-xe@lists.freedesktop.org Subject: [CI 2/8] drm/xe/svm: Introduce DRM_XE_SVM kernel config Date: Wed, 20 Mar 2024 14:45:36 -0400 Message-Id: <20240320184542.2239076-2-oak.zeng@intel.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20240320184542.2239076-1-oak.zeng@intel.com> References: <20240320184542.2239076-1-oak.zeng@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" Introduce a DRM_XE_SVM kernel config entry for xe svm feature. xe svm feature allows share virtual address space between CPU and GPU program. v1: Improve commit message (Thomas) Avoid using #if directive (Thomas) Signed-off-by: Oak Zeng Co-developed-by: Niranjana Vishwanathapura Signed-off-by: Niranjana Vishwanathapura Cc: Matthew Brost Cc: Thomas Hellström Cc: Brian Welty --- drivers/gpu/drm/xe/Kconfig | 21 +++++++++++++++++++++ drivers/gpu/drm/xe/xe_tile.c | 7 +++++-- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/xe/Kconfig b/drivers/gpu/drm/xe/Kconfig index 1a556d087e63..e244165459c5 100644 --- a/drivers/gpu/drm/xe/Kconfig +++ b/drivers/gpu/drm/xe/Kconfig @@ -83,6 +83,27 @@ config DRM_XE_FORCE_PROBE 4571. Use "!*" to block the probe of the driver for all known devices. +config DRM_XE_SVM + bool "Enable Shared Virtual Memory support in xe" + depends on DRM_XE + depends on ARCH_ENABLE_MEMORY_HOTPLUG + depends on ARCH_ENABLE_MEMORY_HOTREMOVE + depends on MEMORY_HOTPLUG + depends on MEMORY_HOTREMOVE + depends on ARCH_HAS_PTE_DEVMAP + depends on SPARSEMEM_VMEMMAP + depends on ZONE_DEVICE + depends on DEVICE_PRIVATE + depends on MMU + select HMM_MIRROR + select MMU_NOTIFIER + default y + help + Choose this option if you want Shared Virtual Memory (SVM) + support in xe. With SVM, virtual address space is shared + between CPU and GPU. This means any virtual address such + as malloc or mmap returns, variables on stack, or global + memory pointers, can be used for GPU transparently. menu "drm/Xe Debugging" depends on DRM_XE diff --git a/drivers/gpu/drm/xe/xe_tile.c b/drivers/gpu/drm/xe/xe_tile.c index f1c4f9de51df..a1a436912fe3 100644 --- a/drivers/gpu/drm/xe/xe_tile.c +++ b/drivers/gpu/drm/xe/xe_tile.c @@ -159,9 +159,12 @@ static int tile_ttm_mgr_init(struct xe_tile *tile) */ int xe_tile_init_noalloc(struct xe_tile *tile) { - struct xe_device *xe = tile_to_xe(tile); + struct xe_device __maybe_unused *xe; int err; + if (IS_ENABLED(CONFIG_DRM_XE_SVM)) + xe = tile_to_xe(tile); + xe_device_mem_access_get(tile_to_xe(tile)); err = tile_ttm_mgr_init(tile); @@ -177,7 +180,7 @@ int xe_tile_init_noalloc(struct xe_tile *tile) xe_tile_sysfs_init(tile); - if (xe->info.has_usm) + if (IS_ENABLED(CONFIG_DRM_XE_SVM) && xe->info.has_usm) xe_devm_add(tile, &tile->mem.vram); err_mem_access: xe_device_mem_access_put(tile_to_xe(tile)); -- 2.26.3