diff options
| author | Mauro Carvalho Chehab <mchehab@kernel.org> | 2023-01-19 23:18:44 +0300 |
|---|---|---|
| committer | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2023-12-20 02:27:43 +0300 |
| commit | 1598955dfce242113c4ba2cbdb5d4c7c28695a70 (patch) | |
| tree | cf0d619775ef65220b5a521ad1dd99438cc26b65 /drivers | |
| parent | a02a0c6d53099579e3b7aa811e1e254a11681c8a (diff) | |
| download | linux-1598955dfce242113c4ba2cbdb5d4c7c28695a70.tar.xz | |
drm/xe/Kconfig.debug: select DEBUG_FS for KUnit runs
KUnit reuquires debugfs, as otherwise, it won't build:
$ make ARCH=x86_64 O=.kunit --jobs=8
ERROR:root:../drivers/gpu/drm/xe/display/intel_display_debugfs.c:1612:6: error: redefinition of ‘intel_display_debugfs_register’
1612 | void intel_display_debugfs_register(struct drm_i915_private *i915)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from ../drivers/gpu/drm/xe/display/intel_display_debugfs.c:18:
../drivers/gpu/drm/xe/display/intel_display_debugfs.h:18:20: note: previous definition of ‘intel_display_debugfs_register’ with type ‘void(struct xe_device *)’
18 | static inline void intel_display_debugfs_register(struct drm_i915_private *i915) {}
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../drivers/gpu/drm/xe/display/intel_display_debugfs.c:1935:6: error: redefinition of ‘intel_connector_debugfs_add’
1935 | void intel_connector_debugfs_add(struct intel_connector *intel_connector)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~
../drivers/gpu/drm/xe/display/intel_display_debugfs.h:19:20: note: previous definition of ‘intel_connector_debugfs_add’ with type ‘void(struct intel_connector *)’
19 | static inline void intel_connector_debugfs_add(struct intel_connector *connector) {}
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~
../drivers/gpu/drm/xe/display/intel_display_debugfs.c:1993:6: error: redefinition of ‘intel_crtc_debugfs_add’
1993 | void intel_crtc_debugfs_add(struct drm_crtc *crtc)
| ^~~~~~~~~~~~~~~~~~~~~~
../drivers/gpu/drm/xe/display/intel_display_debugfs.h:20:20: note: previous definition of ‘intel_crtc_debugfs_add’ with type ‘void(struct drm_crtc *)’
20 | static inline void intel_crtc_debugfs_add(struct drm_crtc *crtc) {}
| ^~~~~~~~~~~~~~~~~~~~~~
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Reviewed-by: Matthew Brost <matthew.brost@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/xe/.kunitconfig | 1 | ||||
| -rw-r--r-- | drivers/gpu/drm/xe/Kconfig.debug | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/xe/.kunitconfig b/drivers/gpu/drm/xe/.kunitconfig index ce8a4348669d..aaf30db71cea 100644 --- a/drivers/gpu/drm/xe/.kunitconfig +++ b/drivers/gpu/drm/xe/.kunitconfig @@ -1,6 +1,7 @@ # xe dependencies CONFIG_KUNIT=y CONFIG_PCI=y +CONFIG_DEBUG_FS=y CONFIG_DRM=y CONFIG_DRM_XE=y CONFIG_EXPERT=y diff --git a/drivers/gpu/drm/xe/Kconfig.debug b/drivers/gpu/drm/xe/Kconfig.debug index b61fd43a76fe..565be3f6b9b9 100644 --- a/drivers/gpu/drm/xe/Kconfig.debug +++ b/drivers/gpu/drm/xe/Kconfig.debug @@ -63,7 +63,7 @@ config DRM_XE_SIMPLE_ERROR_CAPTURE config DRM_XE_KUNIT_TEST tristate "KUnit tests for the drm xe driver" if !KUNIT_ALL_TESTS - depends on DRM_XE && KUNIT + depends on DRM_XE && KUNIT && DEBUG_FS default KUNIT_ALL_TESTS select DRM_EXPORT_FOR_TESTS if m help |