drm/i915: use upstream version of header tests
authorJani Nikula <jani.nikula@intel.com>
Mon, 29 Jul 2019 14:08:47 +0000 (17:08 +0300)
committerJani Nikula <jani.nikula@intel.com>
Tue, 30 Jul 2019 09:11:57 +0000 (12:11 +0300)
Throw out our local hacks of header tests now that the more generic
kbuild versions are upstream.

At least for now, continue to keep the header tests behind
CONFIG_DRM_I915_WERROR=y knob.

Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190729140847.18557-1-jani.nikula@intel.com
drivers/gpu/drm/i915/Kconfig.debug
drivers/gpu/drm/i915/Makefile
drivers/gpu/drm/i915/Makefile.header-test [deleted file]
drivers/gpu/drm/i915/display/Makefile
drivers/gpu/drm/i915/display/Makefile.header-test [deleted file]
drivers/gpu/drm/i915/gem/Makefile
drivers/gpu/drm/i915/gem/Makefile.header-test [deleted file]
drivers/gpu/drm/i915/gt/Makefile
drivers/gpu/drm/i915/gt/Makefile.header-test [deleted file]
drivers/gpu/drm/i915/gt/uc/Makefile
drivers/gpu/drm/i915/gt/uc/Makefile.header-test [deleted file]

index 4cdc0181a093b044ea364b04e57c607a7c9c9fec..87a38c6aaa4113def87908c8b862a566988b8f87 100644 (file)
@@ -7,6 +7,7 @@ config DRM_I915_WERROR
         # We use the dependency on !COMPILE_TEST to not be enabled in
         # allmodconfig or allyesconfig configurations
         depends on !COMPILE_TEST
+       select HEADER_TEST
         default n
         help
           Add -Werror to the build flags for (and only for) i915.ko.
index 524516251a40a0eceedcbc099057dfe9afa8b2c9..654bdcbd23c7b516ac3305cb7d3849491a9750e0 100644 (file)
@@ -33,7 +33,7 @@ subdir-ccflags-y += \
        $(call as-instr,movntdqa (%eax)$(comma)%xmm0,-DCONFIG_AS_MOVNTDQA)
 
 # Extra header tests
-include $(src)/Makefile.header-test
+header-test-pattern-$(CONFIG_DRM_I915_WERROR) := *.h
 
 subdir-ccflags-y += -I$(srctree)/$(src)
 
diff --git a/drivers/gpu/drm/i915/Makefile.header-test b/drivers/gpu/drm/i915/Makefile.header-test
deleted file mode 100644 (file)
index 59908b0..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-# SPDX-License-Identifier: MIT
-# Copyright © 2019 Intel Corporation
-
-# Test the headers are compilable as standalone units
-header-test-$(CONFIG_DRM_I915_WERROR) := \
-       i915_active_types.h \
-       i915_debugfs.h \
-       i915_drv.h \
-       i915_fixed.h \
-       i915_gem_gtt.h \
-       i915_globals.h \
-       i915_irq.h \
-       i915_params.h \
-       i915_priolist_types.h \
-       i915_pvinfo.h \
-       i915_reg.h \
-       i915_scheduler_types.h \
-       i915_utils.h \
-       i915_vgpu.h \
-       intel_csr.h \
-       intel_drv.h \
-       intel_gvt.h \
-       intel_pm.h \
-       intel_runtime_pm.h \
-       intel_sideband.h \
-       intel_uncore.h \
-       intel_wakeref.h
index eec6961015a115decfd878c39390cd3dd8b1e1d1..173c305d78666c1030347925599ca83d1bca0d07 100644 (file)
@@ -2,4 +2,5 @@
 subdir-ccflags-y += -I$(srctree)/$(src)/..
 
 # Extra header tests
-include $(src)/Makefile.header-test
+header-test-pattern-$(CONFIG_DRM_I915_WERROR) := *.h
+header-test- := intel_vbt_defs.h
diff --git a/drivers/gpu/drm/i915/display/Makefile.header-test b/drivers/gpu/drm/i915/display/Makefile.header-test
deleted file mode 100644 (file)
index fc7d4e5..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-# SPDX-License-Identifier: MIT
-# Copyright © 2019 Intel Corporation
-
-# Test the headers are compilable as standalone units
-header_test := $(notdir $(filter-out %/intel_vbt_defs.h,$(wildcard $(src)/*.h)))
-
-quiet_cmd_header_test = HDRTEST $@
-      cmd_header_test = echo "\#include \"$(<F)\"" > $@
-
-header_test_%.c: %.h
-       $(call cmd,header_test)
-
-extra-$(CONFIG_DRM_I915_WERROR) += \
-       $(foreach h,$(header_test),$(patsubst %.h,header_test_%.o,$(h)))
-
-clean-files += $(foreach h,$(header_test),$(patsubst %.h,header_test_%.c,$(h)))
index eec6961015a115decfd878c39390cd3dd8b1e1d1..7e73aa5879670a1183b74a6e81259bade3547875 100644 (file)
@@ -2,4 +2,4 @@
 subdir-ccflags-y += -I$(srctree)/$(src)/..
 
 # Extra header tests
-include $(src)/Makefile.header-test
+header-test-pattern-$(CONFIG_DRM_I915_WERROR) := *.h
diff --git a/drivers/gpu/drm/i915/gem/Makefile.header-test b/drivers/gpu/drm/i915/gem/Makefile.header-test
deleted file mode 100644 (file)
index 61e06cb..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-# SPDX-License-Identifier: MIT
-# Copyright © 2019 Intel Corporation
-
-# Test the headers are compilable as standalone units
-header_test := $(notdir $(wildcard $(src)/*.h))
-
-quiet_cmd_header_test = HDRTEST $@
-      cmd_header_test = echo "\#include \"$(<F)\"" > $@
-
-header_test_%.c: %.h
-       $(call cmd,header_test)
-
-extra-$(CONFIG_DRM_I915_WERROR) += \
-       $(foreach h,$(header_test),$(patsubst %.h,header_test_%.o,$(h)))
-
-clean-files += $(foreach h,$(header_test),$(patsubst %.h,header_test_%.c,$(h)))
index eec6961015a115decfd878c39390cd3dd8b1e1d1..7e73aa5879670a1183b74a6e81259bade3547875 100644 (file)
@@ -2,4 +2,4 @@
 subdir-ccflags-y += -I$(srctree)/$(src)/..
 
 # Extra header tests
-include $(src)/Makefile.header-test
+header-test-pattern-$(CONFIG_DRM_I915_WERROR) := *.h
diff --git a/drivers/gpu/drm/i915/gt/Makefile.header-test b/drivers/gpu/drm/i915/gt/Makefile.header-test
deleted file mode 100644 (file)
index 61e06cb..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-# SPDX-License-Identifier: MIT
-# Copyright © 2019 Intel Corporation
-
-# Test the headers are compilable as standalone units
-header_test := $(notdir $(wildcard $(src)/*.h))
-
-quiet_cmd_header_test = HDRTEST $@
-      cmd_header_test = echo "\#include \"$(<F)\"" > $@
-
-header_test_%.c: %.h
-       $(call cmd,header_test)
-
-extra-$(CONFIG_DRM_I915_WERROR) += \
-       $(foreach h,$(header_test),$(patsubst %.h,header_test_%.o,$(h)))
-
-clean-files += $(foreach h,$(header_test),$(patsubst %.h,header_test_%.c,$(h)))
index db9718aa3ee9cef6c1e432d0e36dc5a74a32838a..bec94d434cb6a4f053eed63bea90b5f0ad4b5259 100644 (file)
@@ -2,4 +2,4 @@
 subdir-ccflags-y += -I$(srctree)/$(src)/../..
 
 # Extra header tests
-include $(src)/Makefile.header-test
+header-test-pattern-$(CONFIG_DRM_I915_WERROR) := *.h
diff --git a/drivers/gpu/drm/i915/gt/uc/Makefile.header-test b/drivers/gpu/drm/i915/gt/uc/Makefile.header-test
deleted file mode 100644 (file)
index 61e06cb..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-# SPDX-License-Identifier: MIT
-# Copyright © 2019 Intel Corporation
-
-# Test the headers are compilable as standalone units
-header_test := $(notdir $(wildcard $(src)/*.h))
-
-quiet_cmd_header_test = HDRTEST $@
-      cmd_header_test = echo "\#include \"$(<F)\"" > $@
-
-header_test_%.c: %.h
-       $(call cmd,header_test)
-
-extra-$(CONFIG_DRM_I915_WERROR) += \
-       $(foreach h,$(header_test),$(patsubst %.h,header_test_%.o,$(h)))
-
-clean-files += $(foreach h,$(header_test),$(patsubst %.h,header_test_%.c,$(h)))