On Tue, Jun 1, 2021 at 4:55 PM Wolfram Sang wsa@the-dreams.de wrote:
Hi Stephen,
After merging the i2c tree, today's linux-next build (x86_64 allmodconfig) failed like this:
In file included from drivers/gpu/drm/i915/i915_gem.c:1250: drivers/gpu/drm/i915/selftests/i915_gem.c:97:13: error: conflicting types for 'pm_suspend' 97 | static void pm_suspend(struct drm_i915_private *i915) | ^~~~~~~~~~ In file included from include/linux/regulator/consumer.h:35, from include/linux/i2c.h:18, from drivers/gpu/drm/i915/i915_drv.h:39, from drivers/gpu/drm/i915/gt/intel_context.h:14, from drivers/gpu/drm/i915/gem/i915_gem_context.h:12, from drivers/gpu/drm/i915/i915_gem.c:44: include/linux/suspend.h:331:12: note: previous declaration of 'pm_suspend' was here 331 | extern int pm_suspend(suspend_state_t state); | ^~~~~~~~~~
Caused by commit
5a7b95fb993e ("i2c: core: support bus regulator controlling in adapter")
interacting with commit
3f51b7e1f36a ("drm/i915/selftests: Add a simple exerciser for suspend/hibernate")
from Linus' tree (v4.20-rc1)
Thank you very much for taking care of this!
Hi, this issue is fixed in https://cgit.freedesktop.org/drm-intel/commit/?h=drm-intel-gt-next&id=5b...
And I think the pull request is in https://lists.freedesktop.org/archives/intel-gfx/2021-May/267588.html
Thanks
I have added the following merge fix patch:
From: Stephen Rothwell sfr@canb.auug.org.au Date: Tue, 1 Jun 2021 10:25:49 +1000 Subject: [PATCH] drm/i915/selftests: Avoid name clash with pm_ global functions
Signed-off-by: Stephen Rothwell sfr@canb.auug.org.au
Looks like the proper solution to me. I think this should be added to the i915 tree. D'accord everyone?
Reviewed-by: Wolfram Sang wsa@kernel.org
Kind regards,
Wolfram