Skip to contentSkip to conversation

drm/i915: rename header test build commands to avoid conflicts

PATCH In review Jani Nikula 4 participants 10 messages Jun 5, 2019 – Jun 7, 2019

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/i915: rename header test build commands to avoid conflicts

We have a local hack to test if headers are self-contained, while upstreaming a proper generic solution in kbuild [1]. Now that both have found themselves in linux-next, the identical cmd_header_test build commands conflict, leading to errors such as:

Quoted 2 lines
Quoted 2 lines

drivers/gpu/drm/i915/header_test_intel_audio.c:1:10: fatal error:
drivers/gpu/drm/i915/intel_audio.h: No such file or directory

    #include "drivers/gpu/drm/i915/intel_audio.h"
	     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Rename the i915 local build command until the proper kbuild solution finds its way to Linus' master and gets backported to our tree, and we can finally switch over.

Note that since the kbuild header test requires CONFIG_HEADER_TEST=y, and our hack requires our debug option CONFIG_DRM_I915_WERROR=y, this is likely hit only by build test bots.

[1] http://marc.info/[email protected]

Cc Chris Wilson <[email protected]>
Cc Masahiro Yamada <[email protected]>
Cc Sam Ravnborg <[email protected]>
---
 drivers/gpu/drm/i915/Makefile.header-test     | 6 +++---
 drivers/gpu/drm/i915/gem/Makefile.header-test | 6 +++---
 drivers/gpu/drm/i915/gt/Makefile.header-test  | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)
drivers/gpu/drm/i915/Makefile.header-test +3 -3
index 6ef3b647ac65..1b4537405b4b 100644
@@ -63,11 +63,11 @@ header_test := \
 	intel_vdsc.h \
 	intel_wakeref.h
 
-quiet_cmd_header_test = HDRTEST $@
-      cmd_header_test = echo "\#include \"$(<F)\"" > $@
+quiet_cmd_i915_header_test = HDRTEST $@
+      cmd_i915_header_test = echo "\#include \"$(<F)\"" > $@
 
 header_test_%.c: %.h
-	$(call cmd,header_test)
+	$(call cmd,i915_header_test)
 
 i915-$(CONFIG_DRM_I915_WERROR) += $(foreach h,$(header_test),$(patsubst %.h,header_test_%.o,$(h)))
 
drivers/gpu/drm/i915/gem/Makefile.header-test +3 -3
index 61e06cbb4b32..50a3aa983659 100644
@@ -4,11 +4,11 @@
 # 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)\"" > $@
+quiet_cmd_i915_header_test = HDRTEST $@
+      cmd_i915_header_test = echo "\#include \"$(<F)\"" > $@
 
 header_test_%.c: %.h
-	$(call cmd,header_test)
+	$(call cmd,i915_header_test)
 
 extra-$(CONFIG_DRM_I915_WERROR) += \
 	$(foreach h,$(header_test),$(patsubst %.h,header_test_%.o,$(h)))
drivers/gpu/drm/i915/gt/Makefile.header-test +3 -3
index 61e06cbb4b32..50a3aa983659 100644
@@ -4,11 +4,11 @@
 # 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)\"" > $@
+quiet_cmd_i915_header_test = HDRTEST $@
+      cmd_i915_header_test = echo "\#include \"$(<F)\"" > $@
 
 header_test_%.c: %.h
-	$(call cmd,header_test)
+	$(call cmd,i915_header_test)
 
 extra-$(CONFIG_DRM_I915_WERROR) += \
 	$(foreach h,$(header_test),$(patsubst %.h,header_test_%.o,$(h)))
Signature · 6 lines
2.20.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

Hi Jani.

Quoted 5 lines · Jani Nikula

We have a local hack to test if headers are self-contained, while upstreaming a proper generic solution in kbuild [1]. Now that both have found themselves in linux-next, the identical cmd_header_test build commands conflict, leading to errors such as:

Quoted 8 lines
Quoted 2 lines
Quoted 2 lines

drivers/gpu/drm/i915/header_test_intel_audio.c:1:10: fatal error:
drivers/gpu/drm/i915/intel_audio.h: No such file or directory

    #include "drivers/gpu/drm/i915/intel_audio.h"
	     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Rename the i915 local build command until the proper kbuild solution finds its way to Linus' master and gets backported to our tree, and we can finally switch over.

You could also ihave switched over now, and accpet that this only would be used in -next for a few months.

Then at least you did not have to rememebr to change it again.

Any way works for me, just a suggestion.

Sam
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#2 lore raw

✓ Fi.CI.BAT: success for drm/i915: rename header test build commands to avoid conflicts

In reply to Jani Nikula
== Series Details ==

== Series Details ==

Series: drm/i915: rename header test build commands to avoid conflicts
URL : https://patchwork.freedesktop.org/series/61655/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_6195 -> Patchwork_13179
====================================================

Summary
-------

**SUCCESS**

No regressions found.

External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13179/

Known issues
------------

Here are the changes found in Patchwork_13179 that come from known issues:

### IGT changes ###

#### Issues hit ####

* igt@gem_ctx_exec@basic:
- fi-cml-u: [PASS][1] -> [INCOMPLETE][2] ([fdo#110566])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6195/fi-cml-u/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13179/fi-cml-u/igt@[email protected]

#### Possible fixes ####

* igt@kms_frontbuffer_tracking@basic:
- fi-hsw-peppy: [DMESG-WARN][3] ([fdo#102614]) -> [PASS][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6195/fi-hsw-peppy/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13179/fi-hsw-peppy/igt@[email protected]

* igt@prime_vgem@basic-fence-flip:
- fi-icl-u3: [DMESG-WARN][5] ([fdo#107724]) -> [PASS][6] +1 similar issue
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6195/fi-icl-u3/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13179/fi-icl-u3/igt@[email protected]

[fdo#102614]: https://bugs.freedesktop.org/show_bug.cgi?id=102614
[fdo#107724]: https://bugs.freedesktop.org/show_bug.cgi?id=107724
[fdo#110566]: https://bugs.freedesktop.org/show_bug.cgi?id=110566

Participating hosts (52 -> 44)
------------------------------

Additional (1): fi-apl-guc
Missing (9): fi-ilk-m540 fi-hsw-4200u fi-byt-j1900 fi-byt-squawks fi-bsw-cyan fi-pnv-d510 fi-kbl-7560u fi-byt-clapper fi-bdw-samus

Build changes
-------------

* Linux: CI_DRM_6195 -> Patchwork_13179

CI_DRM_6195: 06b71939f2477c76f9eecb1dd5e99dcb25cb8371 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5039: 2d4f470bba1cb51ed116fb80b170f717c6294714 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_13179: 372ace4ba9e48be405ce0624313d1fba5e7b76da @ git://anongit.freedesktop.org/gfx-ci/linux

== Linux commits ==

372ace4ba9e4 drm/i915: rename header test build commands to avoid conflicts

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13179/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#3 lore raw
In reply to Jani Nikula

Hi,

Quoted 28 lines

-----Original Message-----
From: Jani Nikula [mailto:[email protected]]
Sent: Wednesday, June 05, 2019 10:22 PM
To: [email protected]
Cc: [email protected]; kbuild test robot <[email protected]>; Chris Wilson <[email protected]>; Yamada, Masahiro/山田 真弘 <[email protected]>; Sam Ravnborg <[email protected]>
Subject: [PATCH] drm/i915: rename header test build commands to avoid conflicts

We have a local hack to test if headers are self-contained, while upstreaming a proper generic solution in kbuild [1]. Now that both have found themselves in linux-next, the identical cmd_header_test build commands conflict, leading to errors such as:

Quoted 2 lines
Quoted 2 lines

drivers/gpu/drm/i915/header_test_intel_audio.c:1:10: fatal error:
drivers/gpu/drm/i915/intel_audio.h: No such file or directory

    #include "drivers/gpu/drm/i915/intel_audio.h"
	     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Rename the i915 local build command until the proper kbuild solution finds its way to Linus' master and gets backported to our tree, and we can finally switch over.

Note that since the kbuild header test requires CONFIG_HEADER_TEST=y, and our hack requires our debug option CONFIG_DRM_I915_WERROR=y, this is likely hit only by build test bots.

Quoted 8 lines

[1] http://marc.info/[email protected]

Cc Chris Wilson <[email protected]>
Cc Masahiro Yamada <[email protected]>
Cc Sam Ravnborg <[email protected]>

---

This is not really queued up yet.

So, we can squash fix-up to avoid 0day bot report.

I attached two patches.

00001-FIXUP1.patch is a one-liner fixup.
If you want to clean up your Makefile by yourself later, I will squash it.

If you want to switch to the generic notation now, I will squash 0001-FIXUP2.patch.

Either is OK for me.

Thanks.

Masahiro Yamada

From 1f6a6367354eec9fa8d9ebae4a9e8ba66ad68af7 Mon Sep 17 00:00:00 2001
From: Masahiro Yamada <[email protected]>
Date: Thu, 6 Jun 2019 11:48:44 +0900
Subject: [PATCH] FIXUP1

---
 drivers/gpu/drm/i915/Makefile.header-test | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/Makefile.header-test +1 -1
index c1c391816fa7..2a456c9223db 100644
@@ -37,7 +37,7 @@ header_test := \
 	intel_workarounds_types.h
 
 quiet_cmd_header_test = HDRTEST $@
-      cmd_header_test = echo "\#include \"$(<F)\"" > $@
+override cmd_header_test = echo "\#include \"$(<F)\"" > $@
 
 header_test_%.c: %.h
 	$(call cmd,header_test)
Signature · 1 line
2.17.1

From 22f46cedb22062f158e99d7eec18564f4d5b2eed Mon Sep 17 00:00:00 2001
From: Masahiro Yamada <[email protected]>
Date: Thu, 6 Jun 2019 11:50:20 +0900
Subject: [PATCH] FIXUP2

---
 drivers/gpu/drm/i915/.gitignore           |  1 -
 drivers/gpu/drm/i915/Makefile.header-test | 12 +-----------
 2 files changed, 1 insertion(+), 12 deletions(-)
 delete mode 100644 drivers/gpu/drm/i915/.gitignore
drivers/gpu/drm/i915/.gitignore deleted +0 -1
deleted file mode 100644
index cff45d81f42f..000000000000
@@ -1 +0,0 @@
-header_test_*.c
drivers/gpu/drm/i915/Makefile.header-test +1 -11
index c1c391816fa7..639b596a06a9 100644
@@ -2,7 +2,7 @@
 # Copyright © 2019 Intel Corporation
 
 # Test the headers are compilable as standalone units
-header_test := \
+header-test-$(CONFIG_DRM_I915_WERROR) := \
 	i915_active_types.h \
 	i915_gem_context_types.h \
 	i915_priolist_types.h \
@@ -35,13 +35,3 @@ header_test := \
 	intel_sprite.h \
 	intel_tv.h \
 	intel_workarounds_types.h
-
-quiet_cmd_header_test = HDRTEST $@
-      cmd_header_test = echo "\#include \"$(<F)\"" > $@
-
-header_test_%.c: %.h
-	$(call cmd,header_test)
-
-i915-$(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)))
Signature · 1 line
2.17.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#4 lore raw
Quoted 40 lines · On Thu, 06 Jun 2019, <[email protected]> wrote:

Hi,

Quoted 28 lines

-----Original Message-----
From: Jani Nikula [mailto:[email protected]]
Sent: Wednesday, June 05, 2019 10:22 PM
To: [email protected]
Cc: [email protected]; kbuild test robot <[email protected]>; Chris Wilson <[email protected]>; Yamada, Masahiro/山田 真弘 <[email protected]>; Sam Ravnborg <[email protected]>
Subject: [PATCH] drm/i915: rename header test build commands to avoid conflicts

We have a local hack to test if headers are self-contained, while upstreaming a proper generic solution in kbuild [1]. Now that both have found themselves in linux-next, the identical cmd_header_test build commands conflict, leading to errors such as:

Quoted 2 lines
Quoted 2 lines

drivers/gpu/drm/i915/header_test_intel_audio.c:1:10: fatal error:
drivers/gpu/drm/i915/intel_audio.h: No such file or directory

    #include "drivers/gpu/drm/i915/intel_audio.h"
	     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Rename the i915 local build command until the proper kbuild solution finds its way to Linus' master and gets backported to our tree, and we can finally switch over.

Note that since the kbuild header test requires CONFIG_HEADER_TEST=y, and our hack requires our debug option CONFIG_DRM_I915_WERROR=y, this is likely hit only by build test bots.

Quoted 8 lines

[1] http://marc.info/[email protected]

Cc Chris Wilson <[email protected]>
Cc Masahiro Yamada <[email protected]>
Cc Sam Ravnborg <[email protected]>

---

Quoted 3 lines

This is not really queued up yet.

So, we can squash fix-up to avoid 0day bot report.

Except I don't think your linux-kbuild.git baseline has the files you're patching below. The problem only exists at the merge of our trees, currently only linux-next, and not "for real" until the v5.3 merge window. So I think the sane option is to patch it up in our tree.

I want to use our local hack until we can get the backmerge from v5.3-rc1, because it's 7-8 weeks away, and I want to retain our own pre-merge build test coverage until then rather than relying on 0day post-merge testing on linux-next.

BR,
Jani.

Quoted 92 lines

I attached two patches.

00001-FIXUP1.patch is a one-liner fixup.
If you want to clean up your Makefile by yourself later, I will squash it.

If you want to switch to the generic notation now, I will squash 0001-FIXUP2.patch.

Either is OK for me.

Thanks.

Masahiro Yamada

From 1f6a6367354eec9fa8d9ebae4a9e8ba66ad68af7 Mon Sep 17 00:00:00 2001
From: Masahiro Yamada <[email protected]>
Date: Thu, 6 Jun 2019 11:48:44 +0900
Subject: [PATCH] FIXUP1

---
 drivers/gpu/drm/i915/Makefile.header-test | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/Makefile.header-test +1 -1
index c1c391816fa7..2a456c9223db 100644
@@ -37,7 +37,7 @@ header_test := \
 	intel_workarounds_types.h
 
 quiet_cmd_header_test = HDRTEST $@
-      cmd_header_test = echo "\#include \"$(<F)\"" > $@
+override cmd_header_test = echo "\#include \"$(<F)\"" > $@
 
 header_test_%.c: %.h
 	$(call cmd,header_test)
Signature · 13 lines
2.17.1

From 22f46cedb22062f158e99d7eec18564f4d5b2eed Mon Sep 17 00:00:00 2001
From: Masahiro Yamada <[email protected]>
Date: Thu, 6 Jun 2019 11:50:20 +0900
Subject: [PATCH] FIXUP2

Signed-off-by: Masahiro Yamada <[email protected]>
---
 drivers/gpu/drm/i915/.gitignore           |  1 -
 drivers/gpu/drm/i915/Makefile.header-test | 12 +-----------
 2 files changed, 1 insertion(+), 12 deletions(-)
 delete mode 100644 drivers/gpu/drm/i915/.gitignore
drivers/gpu/drm/i915/.gitignore deleted +0 -1
deleted file mode 100644
index cff45d81f42f..000000000000
@@ -1 +0,0 @@
-header_test_*.c
drivers/gpu/drm/i915/Makefile.header-test +1 -11
index c1c391816fa7..639b596a06a9 100644
@@ -2,7 +2,7 @@
 # Copyright (C) 2019 Intel Corporation
 
 # Test the headers are compilable as standalone units
-header_test := \
+header-test-$(CONFIG_DRM_I915_WERROR) := \
 	i915_active_types.h \
 	i915_gem_context_types.h \
 	i915_priolist_types.h \
@@ -35,13 +35,3 @@ header_test := \
 	intel_sprite.h \
 	intel_tv.h \
 	intel_workarounds_types.h
-
-quiet_cmd_header_test = HDRTEST $@
-      cmd_header_test = echo "\#include \"$(<F)\"" > $@
-
-header_test_%.c: %.h
-	$(call cmd,header_test)
-
-i915-$(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)))
Signature · 5 lines
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#5 lore raw

Hi Jani,

Quoted 53 lines

-----Original Message-----
From: Jani Nikula [mailto:[email protected]]
Sent: Thursday, June 06, 2019 4:25 PM
To: Yamada, Masahiro/山田 真弘 <[email protected]>; [email protected]
Cc: [email protected]; [email protected]; [email protected]; [email protected]
Subject: RE: [PATCH] drm/i915: rename header test build commands to avoid conflicts

Quoted 7 lines · On Thu, 06 Jun 2019, <[email protected]> wrote:

Hi,

Quoted 5 lines

-----Original Message-----
From: Jani Nikula [mailto:[email protected]]
Sent: Wednesday, June 05, 2019 10:22 PM
To: [email protected]
Cc: [email protected]; kbuild test robot <[email protected]>; Chris

Wilson

Quoted 15 lines
Quoted 15 lines

<[email protected]>; Yamada, Masahiro/山田 真弘 <[email protected]>; Sam Ravnborg <[email protected]>
Subject: [PATCH] drm/i915: rename header test build commands to avoid conflicts

We have a local hack to test if headers are self-contained, while upstreaming a proper generic solution in kbuild [1]. Now that both have found themselves in linux-next, the identical cmd_header_test build commands conflict, leading to errors such as:

Quoted 2 lines
Quoted 2 lines

drivers/gpu/drm/i915/header_test_intel_audio.c:1:10: fatal error:
drivers/gpu/drm/i915/intel_audio.h: No such file or directory

    #include "drivers/gpu/drm/i915/intel_audio.h"
	     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Quoted 6 lines
Quoted 6 lines

Rename the i915 local build command until the proper kbuild solution finds its way to Linus' master and gets backported to our tree, and we can finally switch over.

Note that since the kbuild header test requires CONFIG_HEADER_TEST=y, and our hack requires our debug option CONFIG_DRM_I915_WERROR=y, this

is

Quoted 12 lines
Quoted 10 lines

likely hit only by build test bots.

[1] http://marc.info/[email protected]

Cc Chris Wilson <[email protected]>
Cc Masahiro Yamada <[email protected]>
Cc Sam Ravnborg <[email protected]>

---

Quoted 8 lines
Quoted 3 lines

This is not really queued up yet.

So, we can squash fix-up to avoid 0day bot report.

Except I don't think your linux-kbuild.git baseline has the files you're patching below. The problem only exists at the merge of our trees, currently only linux-next, and not "for real" until the v5.3 merge window. So I think the sane option is to patch it up in our tree.

I do not understand.

This is a _real_ problem since
drivers/gpu/drm/i915/Makefile.header-test
exists in Linus' tree.

The 0-day bot reported the build error against my tree, so I must fix it in my tree.

Quoted 4 lines

I want to use our local hack until we can get the backmerge from v5.3-rc1, because it's 7-8 weeks away, and I want to retain our own pre-merge build test coverage until then rather than relying on 0day post-merge testing on linux-next.

Neither of my patches breaks your test coverage. CONFIG_DRM_I915_WERROR still works in linux-next too.

What am I missing?

Thanks.

Masahiro Yamada

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#6 lore raw
Quoted 82 lines · On Thu, 06 Jun 2019, <[email protected]> wrote:

Hi Jani,

Quoted 53 lines

-----Original Message-----
From: Jani Nikula [mailto:[email protected]]
Sent: Thursday, June 06, 2019 4:25 PM
To: Yamada, Masahiro/山田 真弘 <[email protected]>; [email protected]
Cc: [email protected]; [email protected]; [email protected]; [email protected]
Subject: RE: [PATCH] drm/i915: rename header test build commands to avoid conflicts

Quoted 7 lines · On Thu, 06 Jun 2019, <[email protected]> wrote:

Hi,

Quoted 5 lines

-----Original Message-----
From: Jani Nikula [mailto:[email protected]]
Sent: Wednesday, June 05, 2019 10:22 PM
To: [email protected]
Cc: [email protected]; kbuild test robot <[email protected]>; Chris

Wilson

Quoted 15 lines
Quoted 15 lines

<[email protected]>; Yamada, Masahiro/山田 真弘 <[email protected]>; Sam Ravnborg <[email protected]>
Subject: [PATCH] drm/i915: rename header test build commands to avoid conflicts

We have a local hack to test if headers are self-contained, while upstreaming a proper generic solution in kbuild [1]. Now that both have found themselves in linux-next, the identical cmd_header_test build commands conflict, leading to errors such as:

Quoted 2 lines
Quoted 2 lines

drivers/gpu/drm/i915/header_test_intel_audio.c:1:10: fatal error:
drivers/gpu/drm/i915/intel_audio.h: No such file or directory

    #include "drivers/gpu/drm/i915/intel_audio.h"
	     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Quoted 6 lines
Quoted 6 lines

Rename the i915 local build command until the proper kbuild solution finds its way to Linus' master and gets backported to our tree, and we can finally switch over.

Note that since the kbuild header test requires CONFIG_HEADER_TEST=y, and our hack requires our debug option CONFIG_DRM_I915_WERROR=y, this

is

Quoted 12 lines
Quoted 10 lines

likely hit only by build test bots.

[1] http://marc.info/[email protected]

Cc Chris Wilson <[email protected]>
Cc Masahiro Yamada <[email protected]>
Cc Sam Ravnborg <[email protected]>

---

Quoted 8 lines
Quoted 3 lines

This is not really queued up yet.

So, we can squash fix-up to avoid 0day bot report.

Except I don't think your linux-kbuild.git baseline has the files you're patching below. The problem only exists at the merge of our trees, currently only linux-next, and not "for real" until the v5.3 merge window. So I think the sane option is to patch it up in our tree.

I do not understand.

This is a _real_ problem since
drivers/gpu/drm/i915/Makefile.header-test
exists in Linus' tree.

The 0-day bot reported the build error against my tree, so I must fix it in my tree.

Quoted 4 lines

I want to use our local hack until we can get the backmerge from v5.3-rc1, because it's 7-8 weeks away, and I want to retain our own pre-merge build test coverage until then rather than relying on 0day post-merge testing on linux-next.

Quoted 4 lines

Neither of my patches breaks your test coverage. CONFIG_DRM_I915_WERROR still works in linux-next too.

What am I missing?

Apologies, my bad. I completely failed to realize Makefile.header-test already hit Linus' tree. *facepalm*

You're totally right, it needs to be fixed in your tree. For that, I think the best option is your fixup patch #2.

(Now that header-test-y is behind CONFIG_HEADER_TEST=y, I don't think this really requires CONFIG_DRM_I915_WERROR=y anymore, but no big deal either way.)

We do have two more instances in -next that are not in Linus' tree, so we'll need to fix those locally anyway. Part of the confusion.

BR,
Jani.

Quoted 11 lines

Thanks.

Masahiro Yamada

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Signature · 5 lines
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#7 lore raw
Quoted 3 lines · Jani Nikula

You're totally right, it needs to be fixed in your tree. For that, I think the best option is your fixup patch #2.

OK, I will squash patch #2.

Signature · 6 lines
Best Regards
Masahiro Yamada
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#8 lore raw
Quoted 7 lines · Masahiro Yamada
Quoted 3 lines · Jani Nikula

You're totally right, it needs to be fixed in your tree. For that, I think the best option is your fixup patch #2.

OK, I will squash patch #2.

Many thanks!

BR,
Jani.

Signature · 5 lines
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#9 lore raw

✓ Fi.CI.IGT: success for drm/i915: rename header test build commands to avoid conflicts

In reply to Jani Nikula
== Series Details ==

== Series Details ==

Series: drm/i915: rename header test build commands to avoid conflicts
URL : https://patchwork.freedesktop.org/series/61655/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_6195_full -> Patchwork_13179_full
====================================================

Summary
-------

**SUCCESS**

No regressions found.

Possible new issues
-------------------

Here are the unknown changes that may have been introduced in Patchwork_13179_full:

### IGT changes ###

#### Suppressed ####

The following results come from untrusted machines, tests, or statuses. They do not affect the overall result.

* {igt@gem_exec_balancer@smoke}:
- shard-iclb: [PASS][1] -> [SKIP][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6195/shard-iclb1/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13179/shard-iclb6/igt@[email protected]

Known issues
------------

Here are the changes found in Patchwork_13179_full that come from known issues:

### IGT changes ###

#### Issues hit ####

* igt@gem_eio@in-flight-suspend:
- shard-iclb: [PASS][3] -> [INCOMPLETE][4] ([fdo#107713])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6195/shard-iclb5/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13179/shard-iclb7/igt@[email protected]

* igt@gem_tiled_swapping@non-threaded:
- shard-kbl: [PASS][5] -> [FAIL][6] ([fdo#108686])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6195/shard-kbl6/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13179/shard-kbl3/igt@[email protected]

* igt@i915_pm_rpm@i2c:
- shard-hsw: [PASS][7] -> [FAIL][8] ([fdo#104097])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6195/shard-hsw7/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13179/shard-hsw1/igt@[email protected]

* igt@kms_draw_crc@draw-method-rgb565-mmap-cpu-xtiled:
- shard-skl: [PASS][9] -> [FAIL][10] ([fdo#103184] / [fdo#103232])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6195/shard-skl6/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13179/shard-skl7/igt@[email protected]

* igt@kms_flip@flip-vs-expired-vblank-interruptible:
- shard-hsw: [PASS][11] -> [FAIL][12] ([fdo#102887] / [fdo#105363])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6195/shard-hsw2/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13179/shard-hsw8/igt@[email protected]

* igt@kms_frontbuffer_tracking@fbc-1p-pri-indfb-multidraw:
- shard-iclb: [PASS][13] -> [FAIL][14] ([fdo#103167]) +7 similar issues
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6195/shard-iclb3/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13179/shard-iclb3/igt@[email protected]

* igt@kms_frontbuffer_tracking@fbc-2p-primscrn-cur-indfb-draw-render:
- shard-hsw: [PASS][15] -> [SKIP][16] ([fdo#109271]) +26 similar issues
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6195/shard-hsw6/igt@kms_frontbuffer_tracking@fbc-2p-primscrn-cur-indfb-draw-render.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13179/shard-hsw1/igt@kms_frontbuffer_tracking@fbc-2p-primscrn-cur-indfb-draw-render.html

* igt@kms_plane@plane-panning-bottom-right-suspend-pipe-b-planes:
- shard-apl: [PASS][17] -> [DMESG-WARN][18] ([fdo#108566]) +2 similar issues
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6195/shard-apl7/igt@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13179/shard-apl4/igt@[email protected]

* igt@kms_plane_alpha_blend@pipe-b-coverage-7efc:
- shard-skl: [PASS][19] -> [FAIL][20] ([fdo#108145] / [fdo#110403])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6195/shard-skl4/igt@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13179/shard-skl10/igt@[email protected]

* igt@kms_setmode@basic:
- shard-kbl: [PASS][21] -> [FAIL][22] ([fdo#99912])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6195/shard-kbl3/igt@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13179/shard-kbl2/igt@[email protected]

#### Possible fixes ####

* {igt@gem_exec_balancer@bonded-imm}:
- shard-iclb: [FAIL][23] -> [PASS][24]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6195/shard-iclb4/igt@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13179/shard-iclb8/igt@[email protected]

* igt@gem_tiled_swapping@non-threaded:
- shard-apl: [DMESG-WARN][25] ([fdo#108686]) -> [PASS][26]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6195/shard-apl2/igt@[email protected]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13179/shard-apl4/igt@[email protected]

* igt@gem_workarounds@suspend-resume-context:
- shard-apl: [DMESG-WARN][27] ([fdo#108566]) -> [PASS][28] +4 similar issues
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6195/shard-apl6/igt@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13179/shard-apl5/igt@[email protected]

* igt@i915_pm_backlight@fade_with_suspend:
- shard-skl: [INCOMPLETE][29] ([fdo#104108]) -> [PASS][30]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6195/shard-skl7/igt@i915_pm_backlight@fade_with_suspend.html
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13179/shard-skl2/igt@i915_pm_backlight@fade_with_suspend.html

* igt@i915_pm_rpm@system-suspend-execbuf:
- shard-skl: [INCOMPLETE][31] ([fdo#104108] / [fdo#107807]) -> [PASS][32]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6195/shard-skl9/igt@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13179/shard-skl9/igt@[email protected]

* igt@kms_dp_dsc@basic-dsc-enable-edp:
- shard-iclb: [SKIP][33] ([fdo#109349]) -> [PASS][34]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6195/shard-iclb7/igt@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13179/shard-iclb2/igt@[email protected]

* igt@kms_frontbuffer_tracking@fbc-1p-rte:
- shard-iclb: [FAIL][35] ([fdo#103167] / [fdo#110378]) -> [PASS][36]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6195/shard-iclb7/igt@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13179/shard-iclb8/igt@[email protected]

* igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-cur-indfb-draw-pwrite:
- shard-hsw: [SKIP][37] ([fdo#109271]) -> [PASS][38] +19 similar issues
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6195/shard-hsw1/igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-cur-indfb-draw-pwrite.html
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13179/shard-hsw7/igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-cur-indfb-draw-pwrite.html

* igt@kms_psr@psr2_suspend:
- shard-iclb: [SKIP][39] ([fdo#109441]) -> [PASS][40] +1 similar issue
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6195/shard-iclb7/igt@kms_psr@psr2_suspend.html
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13179/shard-iclb2/igt@kms_psr@psr2_suspend.html

#### Warnings ####

* igt@gem_mmap_gtt@forked-big-copy-odd:
- shard-iclb: [INCOMPLETE][41] ([fdo#107713] / [fdo#109100]) -> [TIMEOUT][42] ([fdo#109673])
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6195/shard-iclb3/igt@[email protected]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13179/shard-iclb6/igt@[email protected]

* igt@gem_tiled_swapping@non-threaded:
- shard-iclb: [FAIL][43] ([fdo#108686]) -> [INCOMPLETE][44] ([fdo#107713] / [fdo#108686])
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6195/shard-iclb6/igt@[email protected]
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13179/shard-iclb2/igt@[email protected]
- shard-hsw: [FAIL][45] ([fdo#108686]) -> [INCOMPLETE][46] ([fdo#103540])
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6195/shard-hsw1/igt@[email protected]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13179/shard-hsw7/igt@[email protected]

* igt@kms_cursor_legacy@2x-long-cursor-vs-flip-atomic:
- shard-hsw: [SKIP][47] ([fdo#109271]) -> [FAIL][48] ([fdo#105767])
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6195/shard-hsw1/igt@[email protected]
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13179/shard-hsw6/igt@[email protected]

* igt@kms_frontbuffer_tracking@fbcpsr-suspend:
- shard-skl: [FAIL][49] ([fdo#108040]) -> [FAIL][50] ([fdo#103167])
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6195/shard-skl6/igt@[email protected]
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13179/shard-skl7/igt@[email protected]

{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).

[fdo#102887]: https://bugs.freedesktop.org/show_bug.cgi?id=102887
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#103184]: https://bugs.freedesktop.org/show_bug.cgi?id=103184
[fdo#103232]: https://bugs.freedesktop.org/show_bug.cgi?id=103232
[fdo#103540]: https://bugs.freedesktop.org/show_bug.cgi?id=103540
[fdo#104097]: https://bugs.freedesktop.org/show_bug.cgi?id=104097
[fdo#104108]: https://bugs.freedesktop.org/show_bug.cgi?id=104108
[fdo#105363]: https://bugs.freedesktop.org/show_bug.cgi?id=105363
[fdo#105767]: https://bugs.freedesktop.org/show_bug.cgi?id=105767
[fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
[fdo#107807]: https://bugs.freedesktop.org/show_bug.cgi?id=107807
[fdo#108040]: https://bugs.freedesktop.org/show_bug.cgi?id=108040
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#108566]: https://bugs.freedesktop.org/show_bug.cgi?id=108566
[fdo#108686]: https://bugs.freedesktop.org/show_bug.cgi?id=108686
[fdo#109100]: https://bugs.freedesktop.org/show_bug.cgi?id=109100
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109349]: https://bugs.freedesktop.org/show_bug.cgi?id=109349
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#109673]: https://bugs.freedesktop.org/show_bug.cgi?id=109673
[fdo#110378]: https://bugs.freedesktop.org/show_bug.cgi?id=110378
[fdo#110403]: https://bugs.freedesktop.org/show_bug.cgi?id=110403
[fdo#99912]: https://bugs.freedesktop.org/show_bug.cgi?id=99912

Participating hosts (10 -> 10)
------------------------------

No changes in participating hosts

Build changes
-------------

* Linux: CI_DRM_6195 -> Patchwork_13179

CI_DRM_6195: 06b71939f2477c76f9eecb1dd5e99dcb25cb8371 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5039: 2d4f470bba1cb51ed116fb80b170f717c6294714 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_13179: 372ace4ba9e48be405ce0624313d1fba5e7b76da @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13179/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx