On Mon, 29 Jul 2019, Chris Wilson <chris@xxxxxxxxxxxxxxxxxx> wrote: > Quoting Jani Nikula (2019-07-29 15:08:47) >> 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@xxxxxxxxxxxxxxxxxx> >> Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx> >> >> --- >> >> Technically the upstream versions are only in drm-tip, and not in dinq >> until a backmerge, but I think it's good enough. I don't think it should >> mess anything up. > >> diff --git a/drivers/gpu/drm/i915/Kconfig.debug b/drivers/gpu/drm/i915/Kconfig.debug >> index 4cdc0181a093..87a38c6aaa41 100644 >> --- a/drivers/gpu/drm/i915/Kconfig.debug >> +++ b/drivers/gpu/drm/i915/Kconfig.debug >> @@ -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. >> diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile >> index 42c17a7b0cb0..331b19cc8247 100644 >> --- a/drivers/gpu/drm/i915/Makefile >> +++ b/drivers/gpu/drm/i915/Makefile >> @@ -32,7 +32,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 > > But won't that actually break dinq compilation until the backmerge? For > those of us that compile with WERROR. It breaks the header testing by doing nothing instead, because on dinq those header-test-* variables don't mean anything. Alas this doesn't apply to dinq anyway so I guess I'll wait for the backmerge. BR, Jani. > -Chris > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@xxxxxxxxxxxxxxxxxxxxx > https://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
