Skip to contentSkip to conversation

drm/i915: use upstream version of header tests

PATCH In review Jani Nikula 3 participants 9 messages Jul 29, 2019 – Jul 30, 2019

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

PATCH 1/1 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.

---

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 -----------
 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
drivers/gpu/drm/i915/Kconfig.debug +1 -0
index 4cdc0181a093..87a38c6aaa41 100644
@@ -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
index 42c17a7b0cb0..331b19cc8247 100644
@@ -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
 
 subdir-ccflags-y += -I$(srctree)/$(src)
 
drivers/gpu/drm/i915/Makefile.header-test deleted +0 -27
deleted file mode 100644
index 59908b067942..000000000000
@@ -1,27 +0,0 @@
-# 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
index eec6961015a1..173c305d7866 100644
@@ -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 deleted +0 -16
deleted file mode 100644
index fc7d4e5bd2c6..000000000000
@@ -1,16 +0,0 @@
-# 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)))
drivers/gpu/drm/i915/gem/Makefile +1 -1
index eec6961015a1..7e73aa587967 100644
@@ -2,4 +2,4 @@
 subdir-ccflags-y += -I$(srctree)/$(src)/..
 
 # Extra header tests
-include $(src)/Makefile.header-test
+header-test-pattern-$(CONFIG_DRM_I915_WERROR) := *.h
drivers/gpu/drm/i915/gem/Makefile.header-test deleted +0 -16
deleted file mode 100644
index 61e06cbb4b32..000000000000
@@ -1,16 +0,0 @@
-# SPDX-License-Identifier: MIT
-# Copyright © 2019 Intel Corporation
-
-# 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)\"" > $@
-
-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)))
drivers/gpu/drm/i915/gt/Makefile +1 -1
index eec6961015a1..7e73aa587967 100644
@@ -2,4 +2,4 @@
 subdir-ccflags-y += -I$(srctree)/$(src)/..
 
 # Extra header tests
-include $(src)/Makefile.header-test
+header-test-pattern-$(CONFIG_DRM_I915_WERROR) := *.h
drivers/gpu/drm/i915/gt/Makefile.header-test deleted +0 -16
deleted file mode 100644
index 61e06cbb4b32..000000000000
@@ -1,16 +0,0 @@
-# SPDX-License-Identifier: MIT
-# Copyright © 2019 Intel Corporation
-
-# 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)\"" > $@
-
-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)))
drivers/gpu/drm/i915/gt/uc/Makefile +1 -1
index db9718aa3ee9..bec94d434cb6 100644
@@ -2,4 +2,4 @@
 subdir-ccflags-y += -I$(srctree)/$(src)/../..
 
 # Extra header tests
-include $(src)/Makefile.header-test
+header-test-pattern-$(CONFIG_DRM_I915_WERROR) := *.h
drivers/gpu/drm/i915/gt/uc/Makefile.header-test deleted +0 -16
deleted file mode 100644
index 61e06cbb4b32..000000000000
@@ -1,16 +0,0 @@
-# SPDX-License-Identifier: MIT
-# Copyright © 2019 Intel Corporation
-
-# 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)\"" > $@
-
-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)))
Signature · 6 lines
2.20.1

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

Quoting Jani Nikula (2019-07-29 15:08:47)

Quoted 32 lines

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.

---

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 -0
index 4cdc0181a093..87a38c6aaa41 100644
@@ -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 +0 -0
index 42c17a7b0cb0..331b19cc8247 100644

drivers/gpu/drm/i915/Makefile subdir-ccflags-y += \ · line 35

Quoted 5 lines
drivers/gpu/drm/i915/Makefile +1 -1
@@ -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.
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#2 lore raw
Quoted 35 lines · Chris Wilson

Quoting Jani Nikula (2019-07-29 15:08:47)

Quoted 34 lines

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.

---

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 -0
index 4cdc0181a093..87a38c6aaa41 100644
@@ -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 +0 -0
index 42c17a7b0cb0..331b19cc8247 100644
@@ -32,7 +32,7 @@ subdir-ccflags-y += \
        $(call as-instr,movntdqa (%eax)$(comma)%xmm0,-DCONFIG_AS_MOVNTDQA)
 
Quoted 6 lines

drivers/gpu/drm/i915/Makefile subdir-ccflags-y += \ · line 35

Quoted 3 lines
drivers/gpu/drm/i915/Makefile +1 -1
 # 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.

Quoted 5 lines

-Chris
_______________________________________________
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
#3 lore raw
Quoted 43 lines · Jani Nikula
Quoted 35 lines · Chris Wilson

Quoting Jani Nikula (2019-07-29 15:08:47)

Quoted 34 lines

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.

---

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 -0
index 4cdc0181a093..87a38c6aaa41 100644
@@ -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 +0 -0
index 42c17a7b0cb0..331b19cc8247 100644
@@ -32,7 +32,7 @@ subdir-ccflags-y += \
        $(call as-instr,movntdqa (%eax)$(comma)%xmm0,-DCONFIG_AS_MOVNTDQA)
 
Quoted 6 lines

drivers/gpu/drm/i915/Makefile subdir-ccflags-y += \ · line 35

Quoted 3 lines
drivers/gpu/drm/i915/Makefile +1 -1
 # 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.

Quoted 5 lines

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.

Got the backmerge, this applies cleanly to dinq and should work fine now. May I trouble you for review please?

BR,
Jani.

Quoted 10 lines

BR,
Jani.

Quoted 5 lines

-Chris
_______________________________________________
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
#4 lore raw

✗ Fi.CI.CHECKPATCH: warning for drm/i915: use upstream version of header tests

In reply to Jani Nikula
== Series Details ==

== Series Details ==

Series: drm/i915: use upstream version of header tests
URL : https://patchwork.freedesktop.org/series/64389/
State : warning

== Summary ==

$ dim checkpatch origin/drm-tip
a8bcdef1fcc9 drm/i915: use upstream version of header tests
-:41: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating?
#41: 
deleted file mode 100644

total: 0 errors, 1 warnings, 0 checks, 36 lines checked

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

#5 lore raw

✓ Fi.CI.BAT: success for drm/i915: use upstream version of header tests

In reply to Jani Nikula
== Series Details ==

== Series Details ==

Series: drm/i915: use upstream version of header tests
URL : https://patchwork.freedesktop.org/series/64389/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_6574 -> Patchwork_13787
====================================================

Summary
-------

**SUCCESS**

No regressions found.

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

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

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

### IGT changes ###

#### Issues hit ####

* igt@kms_busy@basic-flip-a:
- fi-kbl-7567u: [PASS][1] -> [SKIP][2] ([fdo#109271] / [fdo#109278]) +2 similar issues
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6574/fi-kbl-7567u/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13787/fi-kbl-7567u/igt@[email protected]

* igt@kms_chamelium@common-hpd-after-suspend:
- fi-kbl-7567u: [PASS][3] -> [WARN][4] ([fdo#109380])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6574/fi-kbl-7567u/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13787/fi-kbl-7567u/igt@[email protected]

* igt@kms_pipe_crc_basic@read-crc-pipe-c:
- fi-kbl-7567u: [PASS][5] -> [SKIP][6] ([fdo#109271]) +23 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6574/fi-kbl-7567u/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13787/fi-kbl-7567u/igt@[email protected]

#### Possible fixes ####

* igt@gem_basic@create-fd-close:
- fi-icl-u3: [DMESG-WARN][7] ([fdo#107724]) -> [PASS][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6574/fi-icl-u3/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13787/fi-icl-u3/igt@[email protected]

* igt@gem_ctx_create@basic-files:
- fi-icl-u3: [INCOMPLETE][9] ([fdo#107713] / [fdo#109100]) -> [PASS][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6574/fi-icl-u3/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13787/fi-icl-u3/igt@[email protected]

* igt@i915_selftest@live_execlists:
- fi-skl-gvtdvm: [DMESG-FAIL][11] ([fdo#111108]) -> [PASS][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6574/fi-skl-gvtdvm/igt@i915_selftest@live_execlists.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13787/fi-skl-gvtdvm/igt@i915_selftest@live_execlists.html

[fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
[fdo#107724]: https://bugs.freedesktop.org/show_bug.cgi?id=107724
[fdo#109100]: https://bugs.freedesktop.org/show_bug.cgi?id=109100
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
[fdo#109380]: https://bugs.freedesktop.org/show_bug.cgi?id=109380
[fdo#111108]: https://bugs.freedesktop.org/show_bug.cgi?id=111108

Participating hosts (51 -> 43)
------------------------------

Missing (8): fi-kbl-soraka fi-icl-u4 fi-byt-j1900 fi-byt-squawks fi-bsw-cyan fi-icl-y fi-byt-clapper fi-bdw-samus

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

* CI: CI-20190529 -> None
* Linux: CI_DRM_6574 -> Patchwork_13787

CI-20190529: 20190529
CI_DRM_6574: 30577cdd3fc7a9385b5ef15940606d320d6e2c4a @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5114: 54450721c3b323d01e0c6e5d5e883b7499c8022c @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_13787: a8bcdef1fcc9f3d1538c30bd4b217e55805c496f @ git://anongit.freedesktop.org/gfx-ci/linux

== Linux commits ==

a8bcdef1fcc9 drm/i915: use upstream version of header tests

== Logs ==

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

#6 lore raw

✓ Fi.CI.IGT: success for drm/i915: use upstream version of header tests

In reply to Jani Nikula
== Series Details ==

== Series Details ==

Series: drm/i915: use upstream version of header tests
URL : https://patchwork.freedesktop.org/series/64389/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_6574_full -> Patchwork_13787_full
====================================================

Summary
-------

**SUCCESS**

No regressions found.

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

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

### IGT changes ###

#### Issues hit ####

* igt@gem_tiled_swapping@non-threaded:
- shard-glk: [PASS][1] -> [DMESG-WARN][2] ([fdo#108686])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6574/shard-glk8/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13787/shard-glk8/igt@[email protected]

* igt@kms_flip@flip-vs-expired-vblank-interruptible:
- shard-skl: [PASS][3] -> [FAIL][4] ([fdo#105363])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6574/shard-skl5/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13787/shard-skl10/igt@[email protected]

* igt@kms_flip@flip-vs-suspend:
- shard-kbl: [PASS][5] -> [INCOMPLETE][6] ([fdo#103665])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6574/shard-kbl4/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13787/shard-kbl2/igt@[email protected]

* igt@kms_frontbuffer_tracking@fbc-1p-offscren-pri-shrfb-draw-pwrite:
- shard-iclb: [PASS][7] -> [FAIL][8] ([fdo#103167]) +5 similar issues
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6574/shard-iclb6/igt@kms_frontbuffer_tracking@fbc-1p-offscren-pri-shrfb-draw-pwrite.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13787/shard-iclb6/igt@kms_frontbuffer_tracking@fbc-1p-offscren-pri-shrfb-draw-pwrite.html

* igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-indfb-msflip-blt:
- shard-skl: [PASS][9] -> [FAIL][10] ([fdo#108040]) +2 similar issues
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6574/shard-skl3/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-indfb-msflip-blt.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13787/shard-skl2/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-indfb-msflip-blt.html

* igt@kms_plane@plane-panning-bottom-right-suspend-pipe-a-planes:
- shard-apl: [PASS][11] -> [DMESG-WARN][12] ([fdo#108566]) +1 similar issue
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6574/shard-apl2/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13787/shard-apl4/igt@[email protected]

* igt@kms_plane_alpha_blend@pipe-c-constant-alpha-min:
- shard-skl: [PASS][13] -> [FAIL][14] ([fdo#108145]) +1 similar issue
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6574/shard-skl4/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13787/shard-skl7/igt@[email protected]

* igt@kms_plane_alpha_blend@pipe-c-coverage-7efc:
- shard-skl: [PASS][15] -> [FAIL][16] ([fdo#108145] / [fdo#110403])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6574/shard-skl1/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13787/shard-skl4/igt@[email protected]

* igt@kms_plane_lowres@pipe-a-tiling-x:
- shard-iclb: [PASS][17] -> [FAIL][18] ([fdo#103166]) +1 similar issue
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6574/shard-iclb8/igt@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13787/shard-iclb4/igt@[email protected]

* igt@kms_psr2_su@page_flip:
- shard-iclb: [PASS][19] -> [SKIP][20] ([fdo#109642] / [fdo#111068])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6574/shard-iclb2/igt@kms_psr2_su@page_flip.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13787/shard-iclb8/igt@kms_psr2_su@page_flip.html

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

* igt@perf_pmu@busy-accuracy-50-bcs0:
- shard-iclb: [PASS][23] -> [INCOMPLETE][24] ([fdo#107713]) +2 similar issues
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6574/shard-iclb3/igt@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13787/shard-iclb4/igt@[email protected]

#### Possible fixes ####

* igt@gem_eio@unwedge-stress:
- shard-snb: [FAIL][25] ([fdo#109661]) -> [PASS][26]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6574/shard-snb6/igt@[email protected]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13787/shard-snb2/igt@[email protected]

* igt@i915_suspend@debugfs-reader:
- shard-apl: [DMESG-WARN][27] ([fdo#108566]) -> [PASS][28]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6574/shard-apl8/igt@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13787/shard-apl2/igt@[email protected]

* igt@kms_big_fb@x-tiled-16bpp-rotate-0:
- shard-snb: [INCOMPLETE][29] ([fdo#105411]) -> [PASS][30]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6574/shard-snb6/igt@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13787/shard-snb2/igt@[email protected]

* igt@kms_cursor_crc@pipe-b-cursor-256x256-sliding:
- shard-skl: [FAIL][31] ([fdo#103232]) -> [PASS][32]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6574/shard-skl9/igt@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13787/shard-skl1/igt@[email protected]

* igt@kms_flip@2x-flip-vs-expired-vblank-interruptible:
- shard-glk: [FAIL][33] ([fdo#105363]) -> [PASS][34]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6574/shard-glk4/igt@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13787/shard-glk2/igt@[email protected]

* igt@kms_flip@plain-flip-fb-recreate:
- shard-skl: [FAIL][35] ([fdo#100368]) -> [PASS][36]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6574/shard-skl2/igt@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13787/shard-skl9/igt@[email protected]

* igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-render:
- shard-iclb: [FAIL][37] ([fdo#103167]) -> [PASS][38] +2 similar issues
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6574/shard-iclb2/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-render.html
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13787/shard-iclb8/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-render.html

* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b:
- shard-kbl: [INCOMPLETE][39] ([fdo#103665]) -> [PASS][40]
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6574/shard-kbl4/igt@[email protected]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13787/shard-kbl7/igt@[email protected]

* igt@kms_psr@psr2_primary_mmap_cpu:
- shard-iclb: [SKIP][41] ([fdo#109441]) -> [PASS][42] +2 similar issues
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6574/shard-iclb3/igt@kms_psr@psr2_primary_mmap_cpu.html
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13787/shard-iclb2/igt@kms_psr@psr2_primary_mmap_cpu.html

[fdo#100368]: https://bugs.freedesktop.org/show_bug.cgi?id=100368
[fdo#103166]: https://bugs.freedesktop.org/show_bug.cgi?id=103166
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#103232]: https://bugs.freedesktop.org/show_bug.cgi?id=103232
[fdo#103665]: https://bugs.freedesktop.org/show_bug.cgi?id=103665
[fdo#105363]: https://bugs.freedesktop.org/show_bug.cgi?id=105363
[fdo#105411]: https://bugs.freedesktop.org/show_bug.cgi?id=105411
[fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
[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#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#109642]: https://bugs.freedesktop.org/show_bug.cgi?id=109642
[fdo#109661]: https://bugs.freedesktop.org/show_bug.cgi?id=109661
[fdo#110403]: https://bugs.freedesktop.org/show_bug.cgi?id=110403
[fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068
[fdo#99912]: https://bugs.freedesktop.org/show_bug.cgi?id=99912

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

No changes in participating hosts

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

* CI: CI-20190529 -> None
* Linux: CI_DRM_6574 -> Patchwork_13787

CI-20190529: 20190529
CI_DRM_6574: 30577cdd3fc7a9385b5ef15940606d320d6e2c4a @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5114: 54450721c3b323d01e0c6e5d5e883b7499c8022c @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_13787: a8bcdef1fcc9f3d1538c30bd4b217e55805c496f @ 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_13787/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reviewed-by on v1 1/1
#7 lore raw
In reply to Jani Nikula

Quoting Jani Nikula (2019-07-29 15:08:47)

Quoted 14 lines

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.

---

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.

Quoted 12 lines
---
 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)

Quoted 12 lines
 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
drivers/gpu/drm/i915/Kconfig.debug +0 -0
index 4cdc0181a093..87a38c6aaa41 100644

drivers/gpu/drm/i915/Kconfig.debug config DRM_I915_WERROR · line 10

Quoted 4 lines
drivers/gpu/drm/i915/Kconfig.debug +1 -0
@@ -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?

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

#8 lore raw
Quoted 37 lines · Chris Wilson

Quoting Jani Nikula (2019-07-29 15:08:47)

Quoted 14 lines

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.

---

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.

Quoted 12 lines
---
 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)

Quoted 7 lines
 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
Quoted 11 lines

drivers/gpu/drm/i915/Kconfig.debug config DRM_I915_WERROR · line 10

Quoted 9 lines
drivers/gpu/drm/i915/Kconfig.debug +1 -0
index 4cdc0181a093..87a38c6aaa41 100644
@@ -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. :/

Quoted 1 line

Thanks, pushed to dinq.

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