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 48AD4C2BA16 for ; Thu, 13 Jun 2024 15:22:07 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C840D10EABA; Thu, 13 Jun 2024 15:22:04 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="DwktsMTD"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.14]) by gabe.freedesktop.org (Postfix) with ESMTPS id 266DD10EAD9 for ; Thu, 13 Jun 2024 15:20:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1718292047; x=1749828047; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=XAJRpBfzo5ZnByXPMeXdEUKzPeXusAh3b/5jS5OrhvQ=; b=DwktsMTDiFrwBDowUIQFw+SZs7bZaNmMyZeMvEdDYwpD1N/+ISLbVb7u aJIT1RcJVzBAbJwh6aqVTypAJNh+UZBK//H/hQJHFQAegObL+EESAqz0J SNBrBjJIWTE9rCMtak/CWHmwxh7wMFP/z0uDuprplsaC49xsidGfJAsLR oD4Y9rj/bgoZx85aBFGRvy1VuQ3nFOeksdWEpYBZGRo9eNzu3bJRYgujJ 1e5RUrOy7GXnvpkvlO7Poac+nxslcd+gi3oQB4mTHE1pttHxfR0gHPwC5 iEhs46rwNkdavCpEvdkI0lPyyeIdqjCLfce8Eoi1JYQOkXxxMmeME7XKX A==; X-CSE-ConnectionGUID: PMDe2e04QmSSFiHsUQ/PGg== X-CSE-MsgGUID: zQy+Y+SjQgOL692M6tpkhQ== X-IronPort-AV: E=McAfee;i="6700,10204,11102"; a="15348672" X-IronPort-AV: E=Sophos;i="6.08,235,1712646000"; d="scan'208";a="15348672" Received: from fmviesa008.fm.intel.com ([10.60.135.148]) by fmvoesa108.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Jun 2024 08:20:43 -0700 X-CSE-ConnectionGUID: K8fAf9lLS729aL/tLKKjqw== X-CSE-MsgGUID: 9HXni/iFTTq1EwZsZq6TLw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,235,1712646000"; d="scan'208";a="40135127" Received: from szeng-desk.jf.intel.com ([10.165.21.149]) by fmviesa008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Jun 2024 08:20:43 -0700 From: Oak Zeng To: intel-xe@lists.freedesktop.org Subject: [CI 38/42] drm/xe/svm: Introduce DRM_XE_SVM kernel config Date: Thu, 13 Jun 2024 11:31:24 -0400 Message-Id: <20240613153128.681864-38-oak.zeng@intel.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20240613153128.681864-1-oak.zeng@intel.com> References: <20240613153128.681864-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) Cc: Matthew Brost Cc: Thomas Hellström Cc: Brian Welty Cc: Himal Prasad Ghimiray Signed-off-by: Oak Zeng Co-developed-by: Niranjana Vishwanathapura Signed-off-by: Niranjana Vishwanathapura --- drivers/gpu/drm/xe/Kconfig | 21 +++++++++++++++++++++ drivers/gpu/drm/xe/xe_tile.c | 11 ++++++++--- 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/xe/Kconfig b/drivers/gpu/drm/xe/Kconfig index 7bbe46a98ff1..27d6145cefa7 100644 --- a/drivers/gpu/drm/xe/Kconfig +++ b/drivers/gpu/drm/xe/Kconfig @@ -84,6 +84,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 6c50df281b11..1f938d001094 100644 --- a/drivers/gpu/drm/xe/xe_tile.c +++ b/drivers/gpu/drm/xe/xe_tile.c @@ -171,8 +171,13 @@ static void __init_drm_mem_region_ops(struct drm_mem_region_ops *ops) int xe_tile_init_noalloc(struct xe_tile *tile) { int err; - struct xe_device *xe = tile_to_xe(tile); - struct drm_device *drm = &xe->drm; + struct xe_device __maybe_unused *xe; + struct drm_device __maybe_unused *drm; + + if (IS_ENABLED(CONFIG_DRM_XE_SVM)) { + xe = tile_to_xe(tile); + drm = &xe->drm; + } err = tile_ttm_mgr_init(tile); if (err) @@ -186,7 +191,7 @@ int xe_tile_init_noalloc(struct xe_tile *tile) err = xe_tile_sysfs_init(tile); - if (xe->info.has_usm) { + if (IS_ENABLED(CONFIG_DRM_XE_SVM) && xe->info.has_usm) { __init_drm_mem_region_ops(&tile->mem.vram.drm_mr.mr_ops); drm_svm_register_mem_region(drm, &tile->mem.vram.drm_mr, MEMORY_DEVICE_PRIVATE); } -- 2.26.3