[PATCH] drm/xe: don't build debugfs files when CONFIG_DEBUG_FS=n

Randy Dunlap rdunlap at infradead.org
Wed Jan 24 21:35:23 UTC 2024



On 1/24/24 01:05, Jani Nikula wrote:
> If we unconditionally build the debugfs files, we'll get both the static
> inline stubs from the headers and the real functions for
> CONFIG_DEBUG_FS=n. Avoid building the debugfs files with that config.
> 
> Reported-by: Randy Dunlap <rdunlap at infradead.org>
> Closes: https://lore.kernel.org/r/152521f9-119f-4c61-b467-3e91f4aecb1a@infradead.org
> Signed-off-by: Jani Nikula <jani.nikula at intel.com>

Tested-by: Randy Dunlap <rdunlap at infradead.org> # build-tested
Reviewed-by: Randy Dunlap <rdunlap at infradead.org>

Thanks.

> ---
>  drivers/gpu/drm/xe/Makefile | 10 +++++++---
>  1 file changed, 7 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/Makefile b/drivers/gpu/drm/xe/Makefile
> index fe8b266a9819..abb2be8268d0 100644
> --- a/drivers/gpu/drm/xe/Makefile
> +++ b/drivers/gpu/drm/xe/Makefile
> @@ -222,8 +222,6 @@ xe-$(CONFIG_DRM_XE_DISPLAY) += \
>  	i915-display/intel_ddi.o \
>  	i915-display/intel_ddi_buf_trans.o \
>  	i915-display/intel_display.o \
> -	i915-display/intel_display_debugfs.o \
> -	i915-display/intel_display_debugfs_params.o \
>  	i915-display/intel_display_device.o \
>  	i915-display/intel_display_driver.o \
>  	i915-display/intel_display_irq.o \
> @@ -267,7 +265,6 @@ xe-$(CONFIG_DRM_XE_DISPLAY) += \
>  	i915-display/intel_modeset_setup.o \
>  	i915-display/intel_modeset_verify.o \
>  	i915-display/intel_panel.o \
> -	i915-display/intel_pipe_crc.o \
>  	i915-display/intel_pmdemand.o \
>  	i915-display/intel_pps.o \
>  	i915-display/intel_psr.o \
> @@ -294,6 +291,13 @@ ifeq ($(CONFIG_DRM_FBDEV_EMULATION),y)
>  	xe-$(CONFIG_DRM_XE_DISPLAY) += i915-display/intel_fbdev.o
>  endif
>  
> +ifeq ($(CONFIG_DEBUG_FS),y)
> +	xe-$(CONFIG_DRM_XE_DISPLAY) += \
> +		i915-display/intel_display_debugfs.o \
> +		i915-display/intel_display_debugfs_params.o \
> +		i915-display/intel_pipe_crc.o
> +endif
> +
>  obj-$(CONFIG_DRM_XE) += xe.o
>  obj-$(CONFIG_DRM_XE_KUNIT_TEST) += tests/
>  

-- 
#Randy


More information about the Intel-xe mailing list