linux-next: build failure after merge of the tip tree

broonie
2021-12-13T17:09:05Z

Hi all,

After merging the tip tree, today's linux-next build (x86 allmodconfig)
failed like this:

In file included from /tmp/next/build/drivers/gpu/drm/i915/intel_device_info.h:32,
from /tmp/next/build/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h:11,
from /tmp/next/build/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c:11:
/tmp/next/build/drivers/gpu/drm/i915/display/intel_display.h:643:39: error: 'struct pci_dev' declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
643 | bool intel_modeset_probe_defer(struct pci_dev *pdev);
| ^~~~~~~
cc1: all warnings being treated as errors

I didn't investigate too closely exactly which commit caused this and
fixed it up as below:

diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h
index 4b688a9727b39..377790393a855 100644
--- a/drivers/gpu/drm/i915/display/intel_display.h
+++ b/drivers/gpu/drm/i915/display/intel_display.h
@@ -57,6 +57,7 @@ struct intel_plane;
struct intel_plane_state;
struct intel_remapped_info;
struct intel_rotation_info;
+struct pci_dev;

enum i915_gpio {
GPIOA,