On Tue, 13 Feb 2024, Arnd Bergmann <arnd@xxxxxxxxxx> wrote:
> From: Arnd Bergmann <arnd@xxxxxxxx>
>
> Some of the debugfs functions are stubbed out in these configurations,
> so trying to build the .c file with the definition fails:
>
> In file included from include/uapi/linux/posix_types.h:5,
> from drivers/gpu/drm/i915/display/intel_pipe_crc.c:27:
> drivers/gpu/drm/i915/display/intel_pipe_crc.c: At top level:
> include/linux/stddef.h:8:16: error: expected identifier or '(' before 'void'
> 8 | #define NULL ((void *)0)
> | ^~~~
> drivers/gpu/drm/i915/display/intel_pipe_crc.c:549:20: note: in expansion of macro 'intel_crtc_get_crc_sources'
> 549 | const char *const *intel_crtc_get_crc_sources(struct drm_crtc *crtc,
> | ^~~~~~~~~~~~~~~~~~~~~~~~~~
>
> Stop trying to build them by making the Makefile entries conditional,
> same as for the i915 driver.
Already fixed by commit 439987f6f471 ("drm/xe: don't build debugfs files
when CONFIG_DEBUG_FS=n") in drm-xe-next.
Maybe that needs to be picked up for -fixes?
BR,
Jani.
>
> Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
> ---
> 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 efcf0ab7a1a6..7c10ffdb7809 100644
> --- a/drivers/gpu/drm/xe/Makefile
> +++ b/drivers/gpu/drm/xe/Makefile
> @@ -213,8 +213,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 \
> @@ -258,7 +256,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 \
> @@ -275,6 +272,13 @@ xe-$(CONFIG_DRM_XE_DISPLAY) += \
> i915-display/skl_universal_plane.o \
> i915-display/skl_watermark.o
>
> +ifdef CONFIG_DEBUG_FS
> +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
> +
> ifeq ($(CONFIG_ACPI),y)
> xe-$(CONFIG_DRM_XE_DISPLAY) += \
> i915-display/intel_acpi.o \
--
Jani Nikula, Intel
