* Re: linux-next: Tree for Jan 23 (drm/xe/)
[not found] <20240123132929.7cb6ea4c@canb.auug.org.au>
@ 2024-01-23 21:52 ` Randy Dunlap
2024-01-24 9:17 ` Jani Nikula
0 siblings, 1 reply; 3+ messages in thread
From: Randy Dunlap @ 2024-01-23 21:52 UTC (permalink / raw)
To: Stephen Rothwell, Linux Next Mailing List
Cc: intel-gfx, Linux Kernel Mailing List,
dri-devel@lists.freedesktop.org, intel-xe
[-- Attachment #1: Type: text/plain, Size: 10153 bytes --]
On 1/22/24 18:29, Stephen Rothwell wrote:
> Hi all,
>
> News: there will be no linux-next release on Friday
>
> Changes since 20240122:
>
on ARM64, when
DRM_I915 is not set
DRM_XE=m
DEBUG_FS is not set
../drivers/gpu/drm/i915/display/intel_display_debugfs.c:1091:6: error: redefinition of 'intel_display_debugfs_register'
1091 | void intel_display_debugfs_register(struct drm_i915_private *i915)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from ../drivers/gpu/drm/i915/display/intel_display_debugfs.c:19:
../drivers/gpu/drm/i915/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/i915/display/intel_display_debugfs.c:1571:6: error: redefinition of 'intel_connector_debugfs_add'
1571 | void intel_connector_debugfs_add(struct intel_connector *connector)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~
../drivers/gpu/drm/i915/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/i915/display/intel_display_debugfs.c:1626:6: error: redefinition of 'intel_crtc_debugfs_add'
1626 | void intel_crtc_debugfs_add(struct intel_crtc *crtc)
| ^~~~~~~~~~~~~~~~~~~~~~
../drivers/gpu/drm/i915/display/intel_display_debugfs.h:20:20: note: previous definition of 'intel_crtc_debugfs_add' with type 'void(struct intel_crtc *)'
20 | static inline void intel_crtc_debugfs_add(struct intel_crtc *crtc) {}
| ^~~~~~~~~~~~~~~~~~~~~~
../drivers/gpu/drm/i915/display/intel_pipe_crc.c:437:6: error: redefinition of 'intel_crtc_crc_init'
437 | void intel_crtc_crc_init(struct intel_crtc *crtc)
| ^~~~~~~~~~~~~~~~~~~
In file included from ../drivers/gpu/drm/i915/display/intel_pipe_crc.c:36:
../drivers/gpu/drm/i915/display/intel_pipe_crc.h:25:20: note: previous definition of 'intel_crtc_crc_init' with type 'void(struct intel_crtc *)'
25 | static inline void intel_crtc_crc_init(struct intel_crtc *crtc) {}
| ^~~~~~~~~~~~~~~~~~~
../drivers/gpu/drm/i915/display/intel_pipe_crc.c: In function 'intel_crtc_crc_init':
../drivers/gpu/drm/i915/display/intel_pipe_crc.c:439:48: error: 'struct intel_crtc' has no member named 'pipe_crc'
439 | struct intel_pipe_crc *pipe_crc = &crtc->pipe_crc;
| ^~
In file included from ../include/uapi/linux/posix_types.h:5,
from ../include/uapi/linux/types.h:14,
from ../include/linux/types.h:6,
from ../include/linux/kasan-checks.h:5,
from ../include/asm-generic/rwonce.h:26,
from ../arch/arm64/include/asm/rwonce.h:71,
from ../include/linux/compiler.h:251,
from ../include/linux/ctype.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.h:28:36: note: in expansion of macro 'NULL'
28 | #define intel_crtc_get_crc_sources NULL
| ^~~~
../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,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~
../include/linux/stddef.h:8:23: error: expected ')' before numeric constant
8 | #define NULL ((void *)0)
| ^
../drivers/gpu/drm/i915/display/intel_pipe_crc.h:28:36: note: in expansion of macro 'NULL'
28 | #define intel_crtc_get_crc_sources NULL
| ^~~~
../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,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~
../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.h:27:38: note: in expansion of macro 'NULL'
27 | #define intel_crtc_verify_crc_source NULL
| ^~~~
../drivers/gpu/drm/i915/display/intel_pipe_crc.c:556:5: note: in expansion of macro 'intel_crtc_verify_crc_source'
556 | int intel_crtc_verify_crc_source(struct drm_crtc *crtc, const char *source_name,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
../include/linux/stddef.h:8:23: error: expected ')' before numeric constant
8 | #define NULL ((void *)0)
| ^
../drivers/gpu/drm/i915/display/intel_pipe_crc.h:27:38: note: in expansion of macro 'NULL'
27 | #define intel_crtc_verify_crc_source NULL
| ^~~~
../drivers/gpu/drm/i915/display/intel_pipe_crc.c:556:5: note: in expansion of macro 'intel_crtc_verify_crc_source'
556 | int intel_crtc_verify_crc_source(struct drm_crtc *crtc, const char *source_name,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
../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.h:26:35: note: in expansion of macro 'NULL'
26 | #define intel_crtc_set_crc_source NULL
| ^~~~
../drivers/gpu/drm/i915/display/intel_pipe_crc.c:576:5: note: in expansion of macro 'intel_crtc_set_crc_source'
576 | int intel_crtc_set_crc_source(struct drm_crtc *_crtc, const char *source_name)
| ^~~~~~~~~~~~~~~~~~~~~~~~~
../include/linux/stddef.h:8:23: error: expected ')' before numeric constant
8 | #define NULL ((void *)0)
| ^
../drivers/gpu/drm/i915/display/intel_pipe_crc.h:26:35: note: in expansion of macro 'NULL'
26 | #define intel_crtc_set_crc_source NULL
| ^~~~
../drivers/gpu/drm/i915/display/intel_pipe_crc.c:576:5: note: in expansion of macro 'intel_crtc_set_crc_source'
576 | int intel_crtc_set_crc_source(struct drm_crtc *_crtc, const char *source_name)
| ^~~~~~~~~~~~~~~~~~~~~~~~~
../drivers/gpu/drm/i915/display/intel_pipe_crc.c:630:6: error: redefinition of 'intel_crtc_enable_pipe_crc'
630 | void intel_crtc_enable_pipe_crc(struct intel_crtc *crtc)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~
../drivers/gpu/drm/i915/display/intel_pipe_crc.h:33:20: note: previous definition of 'intel_crtc_enable_pipe_crc' with type 'void(struct intel_crtc *)'
33 | static inline void intel_crtc_enable_pipe_crc(struct intel_crtc *crtc)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~
../drivers/gpu/drm/i915/display/intel_pipe_crc.c: In function 'intel_crtc_enable_pipe_crc':
../drivers/gpu/drm/i915/display/intel_pipe_crc.c:633:48: error: 'struct intel_crtc' has no member named 'pipe_crc'
633 | struct intel_pipe_crc *pipe_crc = &crtc->pipe_crc;
| ^~
../drivers/gpu/drm/i915/display/intel_pipe_crc.c: At top level:
../drivers/gpu/drm/i915/display/intel_pipe_crc.c:650:6: error: redefinition of 'intel_crtc_disable_pipe_crc'
650 | void intel_crtc_disable_pipe_crc(struct intel_crtc *crtc)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~
../drivers/gpu/drm/i915/display/intel_pipe_crc.h:29:20: note: previous definition of 'intel_crtc_disable_pipe_crc' with type 'void(struct intel_crtc *)'
29 | static inline void intel_crtc_disable_pipe_crc(struct intel_crtc *crtc)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~
../drivers/gpu/drm/i915/display/intel_pipe_crc.c: In function 'intel_crtc_disable_pipe_crc':
../drivers/gpu/drm/i915/display/intel_pipe_crc.c:653:48: error: 'struct intel_crtc' has no member named 'pipe_crc'
653 | struct intel_pipe_crc *pipe_crc = &crtc->pipe_crc;
| ^~
../drivers/gpu/drm/i915/display/intel_pipe_crc.c: At top level:
../drivers/gpu/drm/i915/display/intel_pipe_crc.c:532:1: warning: 'intel_is_valid_crc_source' defined but not used [-Wunused-function]
532 | intel_is_valid_crc_source(struct drm_i915_private *dev_priv,
| ^~~~~~~~~~~~~~~~~~~~~~~~~
../drivers/gpu/drm/i915/display/intel_pipe_crc.c:420:1: warning: 'display_crc_ctl_parse_source' defined but not used [-Wunused-function]
420 | display_crc_ctl_parse_source(const char *buf, enum intel_pipe_crc_source *s)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
../drivers/gpu/drm/i915/display/intel_pipe_crc.c:279:1: warning: 'intel_crtc_crc_setup_workarounds' defined but not used [-Wunused-function]
279 | intel_crtc_crc_setup_workarounds(struct intel_crtc *crtc, bool enable)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../drivers/gpu/drm/i915/display/intel_pipe_crc.c:229:13: warning: 'vlv_undo_pipe_scramble_reset' defined but not used [-Wunused-function]
229 | static void vlv_undo_pipe_scramble_reset(struct drm_i915_private *dev_priv,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
/opt/crosstool/gcc-13.2.0-nolibc/aarch64-linux/bin/aarch64-linux-ld: cannot find drivers/gpu/drm/xe/i915-display/intel_display_debugfs.o: No such file or directory
/opt/crosstool/gcc-13.2.0-nolibc/aarch64-linux/bin/aarch64-linux-ld: cannot find drivers/gpu/drm/xe/i915-display/intel_pipe_crc.o: No such file or directory
drivers/gpu/drm/xe/xe.o: No such file or directory (ignored)
make[3]: *** No rule to make target 'drivers/gpu/drm/xe/xe.ko', needed by '__modfinal'.
make[3]: Target '__modfinal' not remade because of errors.
Full randconfig file is attached.
--
#Randy
[-- Attachment #2: config-r5611.gz --]
[-- Type: application/gzip, Size: 49281 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: Tree for Jan 23 (drm/xe/)
2024-01-23 21:52 ` linux-next: Tree for Jan 23 (drm/xe/) Randy Dunlap
@ 2024-01-24 9:17 ` Jani Nikula
2024-01-24 21:35 ` Randy Dunlap
0 siblings, 1 reply; 3+ messages in thread
From: Jani Nikula @ 2024-01-24 9:17 UTC (permalink / raw)
To: Randy Dunlap, Stephen Rothwell, Linux Next Mailing List
Cc: intel-gfx, Linux Kernel Mailing List,
dri-devel@lists.freedesktop.org, intel-xe
On Tue, 23 Jan 2024, Randy Dunlap <rdunlap@infradead.org> wrote:
> On 1/22/24 18:29, Stephen Rothwell wrote:
>> Hi all,
>>
>> News: there will be no linux-next release on Friday
>>
>> Changes since 20240122:
>>
>
> on ARM64, when
> DRM_I915 is not set
> DRM_XE=m
> DEBUG_FS is not set
>
> ../drivers/gpu/drm/i915/display/intel_display_debugfs.c:1091:6: error: redefinition of 'intel_display_debugfs_register'
> 1091 | void intel_display_debugfs_register(struct drm_i915_private *i915)
> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> In file included from ../drivers/gpu/drm/i915/display/intel_display_debugfs.c:19:
Does [1] fix the issue?
BR,
Jani.
[1] https://lore.kernel.org/r/20240124090515.3363901-1-jani.nikula@intel.com
--
Jani Nikula, Intel
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: Tree for Jan 23 (drm/xe/)
2024-01-24 9:17 ` Jani Nikula
@ 2024-01-24 21:35 ` Randy Dunlap
0 siblings, 0 replies; 3+ messages in thread
From: Randy Dunlap @ 2024-01-24 21:35 UTC (permalink / raw)
To: Jani Nikula, Stephen Rothwell, Linux Next Mailing List
Cc: intel-gfx, Linux Kernel Mailing List,
dri-devel@lists.freedesktop.org, intel-xe
On 1/24/24 01:17, Jani Nikula wrote:
> On Tue, 23 Jan 2024, Randy Dunlap <rdunlap@infradead.org> wrote:
>> On 1/22/24 18:29, Stephen Rothwell wrote:
>>> Hi all,
>>>
>>> News: there will be no linux-next release on Friday
>>>
>>> Changes since 20240122:
>>>
>>
>> on ARM64, when
>> DRM_I915 is not set
>> DRM_XE=m
>> DEBUG_FS is not set
>>
>> ../drivers/gpu/drm/i915/display/intel_display_debugfs.c:1091:6: error: redefinition of 'intel_display_debugfs_register'
>> 1091 | void intel_display_debugfs_register(struct drm_i915_private *i915)
>> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>> In file included from ../drivers/gpu/drm/i915/display/intel_display_debugfs.c:19:
>
> Does [1] fix the issue?
Yes, thanks.
>
> BR,
> Jani.
>
>
> [1] https://lore.kernel.org/r/20240124090515.3363901-1-jani.nikula@intel.com
>
>
--
#Randy
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-01-24 21:37 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20240123132929.7cb6ea4c@canb.auug.org.au>
2024-01-23 21:52 ` linux-next: Tree for Jan 23 (drm/xe/) Randy Dunlap
2024-01-24 9:17 ` Jani Nikula
2024-01-24 21:35 ` Randy Dunlap
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox