[PATCH] drm/xe: skip building debugfs code for CONFIG_DEBUG_FS=n

Lucas De Marchi lucas.demarchi at intel.com
Wed Feb 21 05:29:54 UTC 2024


+Stephen

On Tue, Feb 13, 2024 at 03:58:54PM +0100, Arnd Bergmann wrote:
>On Tue, Feb 13, 2024, at 15:55, Jani Nikula wrote:
>> On Tue, 13 Feb 2024, Arnd Bergmann <arnd at kernel.org> wrote:
>>> From: Arnd Bergmann <arnd at arndb.de>
>>>
>>> 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?
>
>I made sure that this still happens in linux-next today, but
>it does not seem to contain 439987f6f471.

Looking at https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=2d5c7b7eb345249cb34d42cbc2b97b4c57ea944e
it seems we still don't have drm-xe-next branch in linux-next.

Stephen, could you please add it? Or do I have to do something on my end
before that?  This is the branch:

https://gitlab.freedesktop.org/drm/xe/kernel drm-xe-next

thanks
Lucas De Marchi



>
>     Arnd


More information about the Intel-xe mailing list