[Intel-gfx] [PATCH] drm/i915: use upstream version of header tests

Jani Nikula jani.nikula at intel.com
Tue Jul 30 09:18:48 UTC 2019


On Tue, 30 Jul 2019, Chris Wilson <chris at chris-wilson.co.uk> 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 at chris-wilson.co.uk>
>> Signed-off-by: Jani Nikula <jani.nikula at intel.com>
>> 
>> ---
>> 
>> 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.
>> ---
>>  drivers/gpu/drm/i915/Kconfig.debug            |  1 +
>>  drivers/gpu/drm/i915/Makefile                 |  2 +-
>>  drivers/gpu/drm/i915/Makefile.header-test     | 27 -------------------
>>  drivers/gpu/drm/i915/display/Makefile         |  3 ++-
>>  .../gpu/drm/i915/display/Makefile.header-test | 16 -----------
>>  drivers/gpu/drm/i915/gem/Makefile             |  2 +-
>>  drivers/gpu/drm/i915/gem/Makefile.header-test | 16 -----------
>>  drivers/gpu/drm/i915/gt/Makefile              |  2 +-
>>  drivers/gpu/drm/i915/gt/Makefile.header-test  | 16 -----------
>>  drivers/gpu/drm/i915/gt/uc/Makefile           |  2 +-
>>  .../gpu/drm/i915/gt/uc/Makefile.header-test   | 16 -----------
>
> Looks complete (must remember to not add i915/mm/Makefile.header-test)
>
>>  11 files changed, 7 insertions(+), 96 deletions(-)
>>  delete mode 100644 drivers/gpu/drm/i915/Makefile.header-test
>>  delete mode 100644 drivers/gpu/drm/i915/display/Makefile.header-test
>>  delete mode 100644 drivers/gpu/drm/i915/gem/Makefile.header-test
>>  delete mode 100644 drivers/gpu/drm/i915/gt/Makefile.header-test
>>  delete mode 100644 drivers/gpu/drm/i915/gt/uc/Makefile.header-test
>> 
>> 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
>
> I thought this should be a tab?

Me too, but none of the others around it were. :/

> Reviewed-by: Chris Wilson <chris at chris-wilson.co.uk>

Thanks, pushed to dinq.

BR,
Jani.

-- 
Jani Nikula, Intel Open Source Graphics Center


More information about the Intel-gfx mailing list