Commit 1032a2af authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915: use upstream version of header tests 



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: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190729140847.18557-1-jani.nikula@intel.com
parent 301efe96

drivers/gpu/drm/i915/Kconfig.debug

+1 −0
Original line number Diff line number Diff line
@@ -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.

drivers/gpu/drm/i915/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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)

drivers/gpu/drm/i915/Makefile.header-test

deleted100644 → 0
+0 −27
Original line number Diff line number Diff line 
# 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

drivers/gpu/drm/i915/display/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -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

drivers/gpu/drm/i915/display/Makefile.header-test

deleted100644 → 0
+0 −16
Original line number Diff line number Diff line 
# 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)))

CRA Git | Maintained and supported by SUSTech CRA and CCSE