Received-SPF: pass (google.com: domain of linux-kernel+bounces-85265-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Date: Wed, 28 Feb 2024 09:33:01 -0600
From: Lucas De Marchi <lucas.demarchi@intel.com>
To: Arnd Bergmann <arnd@kernel.org>
CC: Oded Gabbay <ogabbay@kernel.org>, Thomas =?utf-8?Q?Hellstr=C3=B6m?=
	<thomas.hellstrom@linux.intel.com>, Arnd Bergmann <arnd@arndb.de>, "Maarten
 Lankhorst" <maarten.lankhorst@linux.intel.com>, Maxime Ripard
	<mripard@kernel.org>, Thomas Zimmermann <tzimmermann@suse.de>, David Airlie
	<airlied@gmail.com>, Daniel Vetter <daniel@ffwll.ch>, Rodrigo Vivi
	<rodrigo.vivi@intel.com>, Matthew Brost <matthew.brost@intel.com>, "Jani
 Nikula" <jani.nikula@intel.com>, Matt Roper <matthew.d.roper@intel.com>,
	<intel-xe@lists.freedesktop.org>, <dri-devel@lists.freedesktop.org>,
	<linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 1/3] [v2] drm/xe/kunit: fix link failure with built-in xe
Message-ID: <evkoih7ms43gg73jmtjwpyntsm77vs4tm27iblm5fcet27kekf@e675w5ccnpo2>
References: <20240226124736.1272949-1-arnd@kernel.org>
Content-Type: text/plain; charset="us-ascii"; format=flowed
Content-Disposition: inline
In-Reply-To: <20240226124736.1272949-1-arnd@kernel.org>
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?7sQabO7rEqhvt2Tb4/HKF5t9nKLH7Q0Bs7/PTUftKicYuP0IhcagQNVLEFJl?=
 =?us-ascii?Q?SnWD/EuhbaR0qb1sB6W5lgJQBCIUQruA9YbTPfKZSqPpWJxD3t18OjXbDUFl?=
 =?us-ascii?Q?DCis+6A3as40AbsmZFbL0yqzV49RD5m/aVYUVqiTsK8Qeu29T6wtjYZ/WZOk?=
 =?us-ascii?Q?5USj3CApkdZInTceI2OJcQuer0OsQ3GZ+FRiDL4BXYZh+BBDruhM4RE/jCHx?=
 =?us-ascii?Q?AUDsrrAmehznAseJNpB3ujlfmo3hHcpAJ+ivHny8qAelPzA977KalMi8qay3?=
 =?us-ascii?Q?kYnyYP0+5kxv6koaQXSK5IyjCPxpt8Ux2gGVnmaRGryb1VIYNFlaFCXgVxpg?=
 =?us-ascii?Q?k+9xZqtbjnayr/LvPuR8YVPshAVQ5UneH9U4FSlmKEQGb5gL/zXh6EyemEHL?=
 =?us-ascii?Q?clraP3766ojCUO9i/44itjbESbgSX0F/X7QlOHg60wGitNjDU7eTHwQvMM81?=
 =?us-ascii?Q?LXPkSEf8rUbllS+Q4WkPbEQw3HGW9OG9YWL9driuz3ej8jlbyYqAZ9zVodyh?=
 =?us-ascii?Q?a/PHXg1hB8ztXZOnZts+txecmha6aqbhiJMpKZEriqN1YCCvwOW8oneLVb//?=
 =?us-ascii?Q?y2tEJohC3a0MhhX0zOKa0G74IVk1fv9Vwk/8X3IVvBFpSPVKIxdmvraThcI1?=
 =?us-ascii?Q?SNsaypnH1bDKXmI/wWSl45J1VmgAhtNnHiKv+881S+oD6MfKq//I3Kd8pkp9?=
 =?us-ascii?Q?k/JgXsLCb+d6PB85pR1Udb3ZTGNyRmDilhmjl9XyqnsliG9kfB2dLyZeMwvF?=
 =?us-ascii?Q?7Xn5++2cKrAsdX7jhYuBFXz1/8W6Aq4hTnHxNju/ZuVVzxkiCvxFwSUB77HL?=
 =?us-ascii?Q?1aJBXPHNx6skjSFFbOmNS4rXDoVGiPcNYgJubDJcouuoFRD70EUhNnhuleDq?=
 =?us-ascii?Q?Yv0CRHGVkLFpcN1lzqGY6cCLm/P7Ola3Vy575RjifnCgGE+PMiNlck382mWc?=
 =?us-ascii?Q?lKhVstiDPWZbFIT2yv4HtgLPkaWPvVMUX+5rbHPb10HqjbGm9xTY38kD6M/j?=
 =?us-ascii?Q?9tyaE6juHUyZBnAciaPAZQq23pH1m7uoJNUKOqcbnw8Y+XeuBvq0M5cYMmcM?=
 =?us-ascii?Q?ipz8Tvt+MEu/8c2Fh28A8gVtsVVV7JVrVGkrLXOdzfLWfu4Sd1wv0/Prf4l5?=
 =?us-ascii?Q?6KA0zx1FTCo9q0PZkqyYoYUz6c59iJ9KFYOU4tYP+P8GNogKn8JFtihXuONq?=
 =?us-ascii?Q?YFlcKLhROHJ42IszSsufLvi3NB1NWJssPe7LCtbmFzSY2PkSeiAUz+L4Rsl8?=
 =?us-ascii?Q?7GiFqr/KK/cCZt4Zz62YkSnEvPpb9F8cOaLxCFWGHU5tqRLIgTGjkI06vfgq?=
 =?us-ascii?Q?p5pUahUZjSToqZqg/55IoGA3t5KSnlWM0pK2attoinbvzJoMXgpP2rzknZ5n?=
 =?us-ascii?Q?fCo/lrLuNfoinGfYOhp15bfQkb1yJn/z6piX1fwQ0p5cnK/qKlCQppHZiluL?=
 =?us-ascii?Q?UpYXbXSjixnLwROHf7eTZ0T0xpwrqy6MeN+aEf0kVOWw1Q1Az7kVhGISYIOP?=
 =?us-ascii?Q?JNSFzSjTr4KBk4BMId8XG2x+MatiIBit364diQIfjkHDgKMBRoYR9sjg7K2m?=
 =?us-ascii?Q?glrt6L8TcOurHHxvSqqNIcENizkFeV2cClqVXaOXT4imv5o5rfrHr+KATpLV?=
 =?us-ascii?Q?IQ=3D=3D?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 9407e3b5-9cec-4d84-6cc4-08dc3872937c
X-MS-Exchange-CrossTenant-AuthSource: CY5PR11MB6139.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Feb 2024 15:33:13.3015
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: rJRoMM3vygbHs85FJ9qfPxlOYJWj/xgZlwTr6ngwyqbsLGEiU/x1q4e8TykSRvsz9onQ5c2opCw7VPk+Ja9bQGgfDJ7MRn1SuHgAI3O8A2I=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR11MB5951
X-OriginatorOrg: intel.com

On Mon, Feb 26, 2024 at 01:46:36PM +0100, Arnd Bergmann wrote:
>From: Arnd Bergmann <arnd@arndb.de>
>
>When the driver is built-in but the tests are in loadable modules,
>the helpers don't actually get put into the driver:
>
>ERROR: modpost: "xe_kunit_helper_alloc_xe_device" [drivers/gpu/drm/xe/tests/xe_test.ko] undefined!
>
>Change the Makefile to ensure they are always part of the driver
>even when the rest of the kunit tests are in loadable modules.
>
>Fixes: 5095d13d758b ("drm/xe/kunit: Define helper functions to allocate fake xe device")
>Signed-off-by: Arnd Bergmann <arnd@arndb.de>


Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>

thanks
Lucas De Marchi

>---
>v2: don't remove KUNIT dependency
>---
> drivers/gpu/drm/xe/Kconfig       | 1 +
> drivers/gpu/drm/xe/Kconfig.debug | 1 -
> drivers/gpu/drm/xe/Makefile      | 6 ++++--
> 3 files changed, 5 insertions(+), 3 deletions(-)
>
>diff --git a/drivers/gpu/drm/xe/Kconfig b/drivers/gpu/drm/xe/Kconfig
>index 6d4428b19a4c..c3a3b204ae5b 100644
>--- a/drivers/gpu/drm/xe/Kconfig
>+++ b/drivers/gpu/drm/xe/Kconfig
>@@ -11,6 +11,7 @@ config DRM_XE
> 	select DRM_BUDDY
> 	select DRM_EXEC
> 	select DRM_KMS_HELPER
>+	select DRM_KUNIT_TEST_HELPERS if DRM_XE_KUNIT_TEST != n
> 	select DRM_PANEL
> 	select DRM_SUBALLOC_HELPER
> 	select DRM_DISPLAY_DP_HELPER
>diff --git a/drivers/gpu/drm/xe/Kconfig.debug b/drivers/gpu/drm/xe/Kconfig.debug
>index 549065f57a78..df02e5d17d26 100644
>--- a/drivers/gpu/drm/xe/Kconfig.debug
>+++ b/drivers/gpu/drm/xe/Kconfig.debug
>@@ -76,7 +76,6 @@ config DRM_XE_KUNIT_TEST
> 	depends on DRM_XE && KUNIT && DEBUG_FS
> 	default KUNIT_ALL_TESTS
> 	select DRM_EXPORT_FOR_TESTS if m
>-	select DRM_KUNIT_TEST_HELPERS
> 	help
> 	  Choose this option to allow the driver to perform selftests under
> 	  the kunit framework
>diff --git a/drivers/gpu/drm/xe/Makefile b/drivers/gpu/drm/xe/Makefile
>index 4c6ffe4b2172..b596e4482a9b 100644
>--- a/drivers/gpu/drm/xe/Makefile
>+++ b/drivers/gpu/drm/xe/Makefile
>@@ -158,8 +158,10 @@ xe-$(CONFIG_PCI_IOV) += \
> 	xe_lmtt_2l.o \
> 	xe_lmtt_ml.o
>
>-xe-$(CONFIG_DRM_XE_KUNIT_TEST) += \
>-	tests/xe_kunit_helpers.o
>+# include helpers for tests even when XE is built-in
>+ifdef CONFIG_DRM_XE_KUNIT_TEST
>+xe-y += tests/xe_kunit_helpers.o
>+endif
>
> # i915 Display compat #defines and #includes
> subdir-ccflags-$(CONFIG_DRM_XE_DISPLAY) += \
>-- 
>2.39.2
>