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 AAB38C44506 for ; Wed, 21 Jan 2026 17:20:05 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5D10610E853; Wed, 21 Jan 2026 17:20:05 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="OByhvrR9"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.14]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5C40010E853; Wed, 21 Jan 2026 17:20:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1769016003; x=1800552003; h=message-id:date:mime-version:subject:to:cc:references: from:in-reply-to:content-transfer-encoding; bh=RT+nH3hDNGsYT1UnSKOcCfuQw0yC7WxJ2GBu/Q7kfIQ=; b=OByhvrR9BS+odKQPC3moDj4qQ62H1AwUkkArD/3pOrq26l7O1JgG2aYE itzqkmvSUC15G94YVhZJ5UytsU6Wws32U/nROzmn2Ir3pAQk2Hvjtqy+N P5sTpv5NS69eSvqXTDYB0EKoxuX2Sm8Ed4Gxs9X5siIOghJM34ucWCkru nt++qcCgvxYo0RoEhAeLlJjZ2N6mkmwoBwCipOIkYRZD8w+D7LjsU5Ryr eYLlrU/sYGFziiVDiHx10C0K4jiWHzAU3RLW2CLuvdtfJtKftN8G4gbCn x9gZGNElhcJoU59gyNbIUy7nyVBeBdnW02t425csMW+GYvBZGyV4f2aJ5 g==; X-CSE-ConnectionGUID: ZskCy0R/QOu07mD9oPLrBQ== X-CSE-MsgGUID: ewRYWdQ3RkChabpbzarVwQ== X-IronPort-AV: E=McAfee;i="6800,10657,11678"; a="70299113" X-IronPort-AV: E=Sophos;i="6.21,242,1763452800"; d="scan'208";a="70299113" Received: from fmviesa004.fm.intel.com ([10.60.135.144]) by fmvoesa108.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Jan 2026 09:20:03 -0800 X-CSE-ConnectionGUID: ulsi36SFTT+R+bfSrWKahw== X-CSE-MsgGUID: stBHJcLBQUqI6PHpAXWiSA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.21,242,1763452800"; d="scan'208";a="211340559" Received: from smoticic-mobl1.ger.corp.intel.com (HELO [10.245.245.122]) ([10.245.245.122]) by fmviesa004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Jan 2026 09:20:01 -0800 Message-ID: Date: Wed, 21 Jan 2026 17:19:59 +0000 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v3 1/2] drm, drm/xe: Fix xe userptr in the absence of CONFIG_DEVICE_PRIVATE To: =?UTF-8?Q?Thomas_Hellstr=C3=B6m?= , intel-xe@lists.freedesktop.org Cc: Himal Prasad Ghimiray , Matthew Brost , Rodrigo Vivi , dri-devel@lists.freedesktop.org, stable@vger.kernel.org References: <20260121091048.41371-1-thomas.hellstrom@linux.intel.com> <20260121091048.41371-2-thomas.hellstrom@linux.intel.com> Content-Language: en-GB From: Matthew Auld In-Reply-To: <20260121091048.41371-2-thomas.hellstrom@linux.intel.com> Content-Type: text/plain; charset=UTF-8; format=flowed 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" On 21/01/2026 09:10, Thomas Hellström wrote: > CONFIG_DEVICE_PRIVATE is not selected by default by some distros, > for example Fedora, and that leads to a regression in the xe driver > since userptr support gets compiled out. > > It turns out that DRM_GPUSVM, which is needed for xe userptr support > compiles also without CONFIG_DEVICE_PRIVATE, but doesn't compile > without CONFIG_ZONE_DEVICE. > Exclude the drm_pagemap files from compilation with !CONFIG_ZONE_DEVICE, > and remove the CONFIG_DEVICE_PRIVATE dependency from CONFIG_DRM_GPUSVM and > the xe driver's selection of it, re-enabling xe userptr for those configs. > > v2: > - Don't compile the drm_pagemap files unless CONFIG_ZONE_DEVICE is set. > - Adjust the drm_pagemap.h header accordingly. > > Fixes: 9e9787414882 ("drm/xe/userptr: replace xe_hmm with gpusvm") > Cc: Matthew Auld > Cc: Himal Prasad Ghimiray > Cc: Thomas Hellström > Cc: Matthew Brost > Cc: "Thomas Hellström" > Cc: Rodrigo Vivi > Cc: dri-devel@lists.freedesktop.org > Cc: # v6.18+ > Signed-off-by: Thomas Hellström Let me double check that while it does at least build it is also functional without DRM_XE_GPUSVM. I think it takes a different init path and maybe some other differences. Unless you already did? Reviewed-by: Matthew Auld > --- > drivers/gpu/drm/Kconfig | 2 +- > drivers/gpu/drm/Makefile | 4 +++- > drivers/gpu/drm/xe/Kconfig | 2 +- > include/drm/drm_pagemap.h | 18 ++++++++++++++---- > 4 files changed, 19 insertions(+), 7 deletions(-) > > diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig > index a33b90251530..d3d52310c9cc 100644 > --- a/drivers/gpu/drm/Kconfig > +++ b/drivers/gpu/drm/Kconfig > @@ -210,7 +210,7 @@ config DRM_GPUVM > > config DRM_GPUSVM > tristate > - depends on DRM && DEVICE_PRIVATE > + depends on DRM > select HMM_MIRROR > select MMU_NOTIFIER > help > diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile > index 0deee72ef935..0c21029c446f 100644 > --- a/drivers/gpu/drm/Makefile > +++ b/drivers/gpu/drm/Makefile > @@ -108,9 +108,11 @@ obj-$(CONFIG_DRM_EXEC) += drm_exec.o > obj-$(CONFIG_DRM_GPUVM) += drm_gpuvm.o > > drm_gpusvm_helper-y := \ > - drm_gpusvm.o\ > + drm_gpusvm.o > +drm_gpusvm_helper-$(CONFIG_ZONE_DEVICE) += \ > drm_pagemap.o\ > drm_pagemap_util.o > + > obj-$(CONFIG_DRM_GPUSVM) += drm_gpusvm_helper.o > > obj-$(CONFIG_DRM_BUDDY) += drm_buddy.o > diff --git a/drivers/gpu/drm/xe/Kconfig b/drivers/gpu/drm/xe/Kconfig > index 4b288eb3f5b0..c34be1be155b 100644 > --- a/drivers/gpu/drm/xe/Kconfig > +++ b/drivers/gpu/drm/xe/Kconfig > @@ -39,7 +39,7 @@ config DRM_XE > select DRM_TTM > select DRM_TTM_HELPER > select DRM_EXEC > - select DRM_GPUSVM if !UML && DEVICE_PRIVATE > + select DRM_GPUSVM if !UML > select DRM_GPUVM > select DRM_SCHED > select MMU_NOTIFIER > diff --git a/include/drm/drm_pagemap.h b/include/drm/drm_pagemap.h > index 46e9c58f09e0..2baf0861f78f 100644 > --- a/include/drm/drm_pagemap.h > +++ b/include/drm/drm_pagemap.h > @@ -243,6 +243,8 @@ struct drm_pagemap_devmem_ops { > struct dma_fence *pre_migrate_fence); > }; > > +#if IS_ENABLED(CONFIG_ZONE_DEVICE) > + > int drm_pagemap_init(struct drm_pagemap *dpagemap, > struct dev_pagemap *pagemap, > struct drm_device *drm, > @@ -252,17 +254,22 @@ struct drm_pagemap *drm_pagemap_create(struct drm_device *drm, > struct dev_pagemap *pagemap, > const struct drm_pagemap_ops *ops); > > -#if IS_ENABLED(CONFIG_DRM_GPUSVM) > +struct drm_pagemap *drm_pagemap_page_to_dpagemap(struct page *page); > > void drm_pagemap_put(struct drm_pagemap *dpagemap); > > #else > > +static inline struct drm_pagemap *drm_pagemap_page_to_dpagemap(struct page *page) > +{ > + return NULL; > +} > + > static inline void drm_pagemap_put(struct drm_pagemap *dpagemap) > { > } > > -#endif /* IS_ENABLED(CONFIG_DRM_GPUSVM) */ > +#endif /* IS_ENABLED(CONFIG_ZONE_DEVICE) */ > > /** > * drm_pagemap_get() - Obtain a reference on a struct drm_pagemap > @@ -334,6 +341,8 @@ struct drm_pagemap_migrate_details { > u32 source_peer_migrates : 1; > }; > > +#if IS_ENABLED(CONFIG_ZONE_DEVICE) > + > int drm_pagemap_migrate_to_devmem(struct drm_pagemap_devmem *devmem_allocation, > struct mm_struct *mm, > unsigned long start, unsigned long end, > @@ -343,8 +352,6 @@ int drm_pagemap_evict_to_ram(struct drm_pagemap_devmem *devmem_allocation); > > const struct dev_pagemap_ops *drm_pagemap_pagemap_ops_get(void); > > -struct drm_pagemap *drm_pagemap_page_to_dpagemap(struct page *page); > - > void drm_pagemap_devmem_init(struct drm_pagemap_devmem *devmem_allocation, > struct device *dev, struct mm_struct *mm, > const struct drm_pagemap_devmem_ops *ops, > @@ -359,4 +366,7 @@ int drm_pagemap_populate_mm(struct drm_pagemap *dpagemap, > void drm_pagemap_destroy(struct drm_pagemap *dpagemap, bool is_atomic_or_reclaim); > > int drm_pagemap_reinit(struct drm_pagemap *dpagemap); > + > +#endif /* IS_ENABLED(CONFIG_ZONE_DEVICE) */ > + > #endif