All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jani Nikula <jani.nikula@intel.com>
To: Chris Wilson <chris@chris-wilson.co.uk>, intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH] drm/i915: use upstream version of header tests
Date: Mon, 29 Jul 2019 17:33:54 +0300	[thread overview]
Message-ID: <87o91coqp9.fsf@intel.com> (raw)
In-Reply-To: <156440976334.6373.17742144058690324554@skylake-alporthouse-com>

On Mon, 29 Jul 2019, Chris Wilson <chris@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@chris-wilson.co.uk>
>> Signed-off-by: Jani Nikula <jani.nikula@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.
>
>> 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@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

  reply	other threads:[~2019-07-29 14:29 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-07-29 14:08 [PATCH] drm/i915: use upstream version of header tests Jani Nikula
2019-07-29 14:16 ` Chris Wilson
2019-07-29 14:33   ` Jani Nikula [this message]
2019-07-30  8:22     ` Jani Nikula
2019-07-29 16:26 ` ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
2019-07-29 16:55 ` ✓ Fi.CI.BAT: success " Patchwork
2019-07-30  2:10 ` ✓ Fi.CI.IGT: " Patchwork
2019-07-30  8:22 ` [PATCH] " Chris Wilson
2019-07-30  9:18   ` Jani Nikula

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87o91coqp9.fsf@intel.com \
    --to=jani.nikula@intel.com \
    --cc=chris@chris-wilson.co.uk \
    --cc=intel-gfx@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.