Skip to contentSkip to conversation

drm/i915: use explicit includes for i915_reg.h and i915_irq.h

PATCH In review Jani Nikula 3 participants 5 messages Apr 19, 2023

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

PATCH 1/1 drm/i915: use explicit includes for i915_reg.h and i915_irq.h

A lot of places include i915_reg.h implicitly via i915_irq.h, which gets included implicitly via intel_display_trace.h. Remove the includes from the headers, and include i915_reg.h and i915_irq.h explicitly where needed.

---
 drivers/gpu/drm/i915/display/i9xx_wm.c                  | 1 +
 drivers/gpu/drm/i915/display/intel_atomic_plane.c       | 1 +
 drivers/gpu/drm/i915/display/intel_display_power.c      | 1 +
 drivers/gpu/drm/i915/display/intel_display_power_well.c | 1 +
 drivers/gpu/drm/i915/display/intel_display_trace.h      | 1 -
 drivers/gpu/drm/i915/display/intel_fbc.c                | 1 +
 drivers/gpu/drm/i915/display/intel_fifo_underrun.c      | 2 ++
 drivers/gpu/drm/i915/gt/intel_gt_irq.c                  | 1 +
 drivers/gpu/drm/i915/gt/intel_reset.c                   | 1 +
 drivers/gpu/drm/i915/gt/intel_rps.c                     | 1 +
 drivers/gpu/drm/i915/gt/selftest_rps.c                  | 1 +
 drivers/gpu/drm/i915/gt/uc/intel_guc.c                  | 1 +
 drivers/gpu/drm/i915/i915_debugfs.c                     | 1 +
 drivers/gpu/drm/i915/i915_irq.c                         | 1 +
 drivers/gpu/drm/i915/i915_irq.h                         | 2 +-
 drivers/gpu/drm/i915/intel_clock_gating.c               | 1 +
 16 files changed, 16 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/display/i9xx_wm.c +1 -0
index 6288826a9497..af0c79a4c9a4 100644
@@ -4,6 +4,7 @@
  */
 
 #include "i915_drv.h"
+#include "i915_reg.h"
 #include "i9xx_wm.h"
 #include "intel_atomic.h"
 #include "intel_display.h"
drivers/gpu/drm/i915/display/intel_atomic_plane.c +1 -0
index 40de9f0f171b..9f670dcfe76e 100644
@@ -36,6 +36,7 @@
 #include <drm/drm_fourcc.h>
 
 #include "i915_config.h"
+#include "i915_reg.h"
 #include "intel_atomic_plane.h"
 #include "intel_cdclk.h"
 #include "intel_display_rps.h"
drivers/gpu/drm/i915/display/intel_display_power.c +1 -0
index 7c9f4288329e..5150069f3f82 100644
@@ -7,6 +7,7 @@
 
 #include "i915_drv.h"
 #include "i915_irq.h"
+#include "i915_reg.h"
 #include "intel_backlight_regs.h"
 #include "intel_cdclk.h"
 #include "intel_combo_phy.h"
drivers/gpu/drm/i915/display/intel_display_power_well.c +1 -0
index 62bafcbc7937..1a19fd3bf103 100644
@@ -5,6 +5,7 @@
 
 #include "i915_drv.h"
 #include "i915_irq.h"
+#include "i915_reg.h"
 #include "intel_backlight_regs.h"
 #include "intel_combo_phy.h"
 #include "intel_combo_phy_regs.h"
drivers/gpu/drm/i915/display/intel_display_trace.h +0 -1
index 651ea8564e1b..99bdb833591c 100644
@@ -14,7 +14,6 @@
 #include <linux/tracepoint.h>
 
 #include "i915_drv.h"
-#include "i915_irq.h"
 #include "intel_crtc.h"
 #include "intel_display_types.h"
 #include "intel_vblank.h"
drivers/gpu/drm/i915/display/intel_fbc.c +1 -0
index b507ff944864..11bb8cf9c9d0 100644
@@ -44,6 +44,7 @@
 #include <drm/drm_fourcc.h>
 
 #include "i915_drv.h"
+#include "i915_reg.h"
 #include "i915_utils.h"
 #include "i915_vgpu.h"
 #include "intel_cdclk.h"
drivers/gpu/drm/i915/display/intel_fifo_underrun.c +2 -0
index b708a62e509a..e7f77a225739 100644
@@ -26,6 +26,8 @@
  */
 
 #include "i915_drv.h"
+#include "i915_reg.h"
+#include "i915_irq.h"
 #include "intel_de.h"
 #include "intel_display_trace.h"
 #include "intel_display_types.h"
drivers/gpu/drm/i915/gt/intel_gt_irq.c +1 -0
index 1b25a6039152..c0f3ff4746ad 100644
@@ -7,6 +7,7 @@
 
 #include "i915_drv.h"
 #include "i915_irq.h"
+#include "i915_reg.h"
 #include "intel_breadcrumbs.h"
 #include "intel_gt.h"
 #include "intel_gt_irq.h"
drivers/gpu/drm/i915/gt/intel_reset.c +1 -0
index 6194212e8650..195ff72d7a14 100644
@@ -20,6 +20,7 @@
 #include "i915_file_private.h"
 #include "i915_gpu_error.h"
 #include "i915_irq.h"
+#include "i915_reg.h"
 #include "intel_breadcrumbs.h"
 #include "intel_engine_pm.h"
 #include "intel_engine_regs.h"
drivers/gpu/drm/i915/gt/intel_rps.c +1 -0
index b2671ac59dc0..80968e49e2c3 100644
@@ -10,6 +10,7 @@
 #include "display/intel_display.h"
 #include "i915_drv.h"
 #include "i915_irq.h"
+#include "i915_reg.h"
 #include "intel_breadcrumbs.h"
 #include "intel_gt.h"
 #include "intel_gt_clock_utils.h"
drivers/gpu/drm/i915/gt/selftest_rps.c +1 -0
index 84e77e8dbba1..fb30f733b036 100644
@@ -8,6 +8,7 @@
 
 #include "gem/i915_gem_internal.h"
 
+#include "i915_reg.h"
 #include "intel_engine_heartbeat.h"
 #include "intel_engine_pm.h"
 #include "intel_engine_regs.h"
drivers/gpu/drm/i915/gt/uc/intel_guc.c +1 -0
index d76508fa3af7..e89f16ecf1ae 100644
@@ -16,6 +16,7 @@
 #include "intel_guc_submission.h"
 #include "i915_drv.h"
 #include "i915_irq.h"
+#include "i915_reg.h"
 
 /**
  * DOC: GuC
drivers/gpu/drm/i915/i915_debugfs.c +1 -0
index 80c2bf98e341..41389a32e998 100644
@@ -50,6 +50,7 @@
 #include "i915_debugfs_params.h"
 #include "i915_driver.h"
 #include "i915_irq.h"
+#include "i915_reg.h"
 #include "i915_scheduler.h"
 #include "intel_mchbar_regs.h"
 
drivers/gpu/drm/i915/i915_irq.c +1 -0
index ff2f1b115ba1..2b94b8ca8ec9 100644
@@ -54,6 +54,7 @@
 #include "i915_driver.h"
 #include "i915_drv.h"
 #include "i915_irq.h"
+#include "i915_reg.h"
 
 /**
  * DOC: interrupt handling
drivers/gpu/drm/i915/i915_irq.h +1 -1
index 3717a66f97c6..dd47e473ba4f 100644
@@ -9,7 +9,7 @@
 #include <linux/ktime.h>
 #include <linux/types.h>
 
-#include "i915_reg.h"
+#include "i915_reg_defs.h"
 
 enum pipe;
 struct drm_crtc;
drivers/gpu/drm/i915/intel_clock_gating.c +1 -0
index 2c5302bcba19..1d796b76f71b 100644
@@ -36,6 +36,7 @@
 #include "gt/intel_gt_regs.h"
 
 #include "i915_drv.h"
+#include "i915_reg.h"
 #include "intel_clock_gating.h"
 #include "intel_mchbar_regs.h"
 #include "vlv_sideband.h"
Signature · 1 line
2.39.2
#1 lore raw

[Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915: use explicit includes for i915_reg.h and i915_irq.h

== Series Details ==

== Series Details ==

Series: drm/i915: use explicit includes for i915_reg.h and i915_irq.h
URL : https://patchwork.freedesktop.org/series/116684/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_13027 -> Patchwork_116684v1
====================================================

Summary
-------

**SUCCESS**

No regressions found.

External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116684v1/index.html

Participating hosts (37 -> 37)
------------------------------

Additional (1): fi-kbl-soraka
Missing (1): fi-snb-2520m

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

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

### IGT changes ###

#### Issues hit ####

* igt@gem_huc_copy@huc-copy:
- fi-kbl-soraka: NOTRUN -> [SKIP][1] ([fdo#109271] / [i915#2190])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116684v1/fi-kbl-soraka/igt@[email protected]

* igt@gem_lmem_swapping@basic:
- fi-kbl-soraka: NOTRUN -> [SKIP][2] ([fdo#109271] / [i915#4613]) +3 similar issues
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116684v1/fi-kbl-soraka/igt@[email protected]

* igt@i915_selftest@live@gt_pm:
- fi-kbl-soraka: NOTRUN -> [DMESG-FAIL][3] ([i915#1886])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116684v1/fi-kbl-soraka/igt@i915_selftest@live@gt_pm.html

* igt@i915_selftest@live@slpc:
- bat-rplp-1: [PASS][4] -> [DMESG-FAIL][5] ([i915#6367] / [i915#7913])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13027/bat-rplp-1/igt@i915_selftest@[email protected]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116684v1/bat-rplp-1/igt@i915_selftest@[email protected]

* igt@kms_chamelium_frames@hdmi-crc-fast:
- fi-kbl-soraka: NOTRUN -> [SKIP][6] ([fdo#109271]) +16 similar issues
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116684v1/fi-kbl-soraka/igt@[email protected]

* igt@kms_chamelium_hpd@common-hpd-after-suspend:
- fi-glk-j4005: NOTRUN -> [SKIP][7] ([fdo#109271])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116684v1/fi-glk-j4005/igt@[email protected]

#### Possible fixes ####

* igt@dmabuf@all-tests@dma_fence:
- fi-glk-j4005: [ABORT][8] ([i915#8144]) -> [PASS][9]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13027/fi-glk-j4005/igt@dmabuf@all-tests@dma_fence.html
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116684v1/fi-glk-j4005/igt@dmabuf@all-tests@dma_fence.html

* igt@dmabuf@all-tests@dma_fence_chain:
- fi-glk-j4005: [DMESG-FAIL][10] ([i915#8144]) -> [PASS][11]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13027/fi-glk-j4005/igt@dmabuf@all-tests@dma_fence_chain.html
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116684v1/fi-glk-j4005/igt@dmabuf@all-tests@dma_fence_chain.html

* igt@kms_pipe_crc_basic@nonblocking-crc-frame-sequence@pipe-c-dp-1:
- bat-dg2-8: [FAIL][12] ([i915#7932]) -> [PASS][13]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13027/bat-dg2-8/igt@kms_pipe_crc_basic@[email protected]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116684v1/bat-dg2-8/igt@kms_pipe_crc_basic@[email protected]

[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[i915#1886]: https://gitlab.freedesktop.org/drm/intel/issues/1886
[i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#6367]: https://gitlab.freedesktop.org/drm/intel/issues/6367
[i915#7913]: https://gitlab.freedesktop.org/drm/intel/issues/7913
[i915#7932]: https://gitlab.freedesktop.org/drm/intel/issues/7932
[i915#8144]: https://gitlab.freedesktop.org/drm/intel/issues/8144

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

* Linux: CI_DRM_13027 -> Patchwork_116684v1

CI-20190529: 20190529
CI_DRM_13027: 9e1eb302fc69b5d8dc662f1ce7ed8684e87c5751 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7259: 3d3a7f1c041d3f8d84d7457abf96adef0ea071cb @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_116684v1: 9e1eb302fc69b5d8dc662f1ce7ed8684e87c5751 @ git://anongit.freedesktop.org/gfx-ci/linux

### Linux commits

892898b6424d drm/i915: use explicit includes for i915_reg.h and i915_irq.h

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116684v1/index.html

#2 lore raw

[Intel-gfx] ✓ Fi.CI.IGT: success for drm/i915: use explicit includes for i915_reg.h and i915_irq.h

In reply to Jani Nikula
== Series Details ==

== Series Details ==

Series: drm/i915: use explicit includes for i915_reg.h and i915_irq.h
URL : https://patchwork.freedesktop.org/series/116684/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_13027_full -> Patchwork_116684v1_full
====================================================

Summary
-------

**SUCCESS**

No regressions found.

Participating hosts (8 -> 7)
------------------------------

Missing (1): shard-rkl0

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

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

### IGT changes ###

#### Suppressed ####

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

* igt@kms_rotation_crc@multiplane-rotation:
- {shard-rkl}: [PASS][1] -> [ABORT][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13027/shard-rkl-2/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116684v1/shard-rkl-4/igt@[email protected]

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

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

### IGT changes ###

#### Issues hit ####

* igt@gem_barrier_race@remote-request@rcs0:
- shard-apl: [PASS][3] -> [ABORT][4] ([i915#8211] / [i915#8234])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13027/shard-apl6/igt@gem_barrier_race@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116684v1/shard-apl3/igt@gem_barrier_race@[email protected]

* igt@gem_exec_endless@dispatch@rcs0:
- shard-apl: [PASS][5] -> [TIMEOUT][6] ([i915#3778])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13027/shard-apl3/igt@gem_exec_endless@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116684v1/shard-apl3/igt@gem_exec_endless@[email protected]

* igt@gem_exec_fair@basic-pace-share@rcs0:
- shard-glk: [PASS][7] -> [FAIL][8] ([i915#2842]) +1 similar issue
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13027/shard-glk7/igt@gem_exec_fair@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116684v1/shard-glk2/igt@gem_exec_fair@[email protected]

* igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions:
- shard-glk: [PASS][9] -> [FAIL][10] ([i915#2346])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13027/shard-glk8/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116684v1/shard-glk6/igt@[email protected]

* igt@kms_hdr@static-toggle-dpms:
- shard-glk: NOTRUN -> [SKIP][11] ([fdo#109271]) +5 similar issues
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116684v1/shard-glk3/igt@[email protected]

* igt@kms_plane_scaling@planes-downscale-factor-0-5-unity-scaling@pipe-b-vga-1:
- shard-snb: NOTRUN -> [SKIP][12] ([fdo#109271]) +38 similar issues
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116684v1/shard-snb6/igt@kms_plane_scaling@[email protected]

* igt@perf@stress-open-close@0-rcs0:
- shard-glk: [PASS][13] -> [ABORT][14] ([i915#5213])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13027/shard-glk4/igt@perf@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116684v1/shard-glk1/igt@perf@[email protected]

#### Possible fixes ####

* igt@gem_exec_fair@basic-pace-share@rcs0:
- {shard-tglu}: [FAIL][15] ([i915#2842]) -> [PASS][16]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13027/shard-tglu-10/igt@gem_exec_fair@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116684v1/shard-tglu-10/igt@gem_exec_fair@[email protected]

* igt@gen9_exec_parse@allowed-single:
- shard-glk: [ABORT][17] ([i915#5566]) -> [PASS][18]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13027/shard-glk5/igt@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116684v1/shard-glk3/igt@[email protected]

* igt@i915_pm_rpm@dpms-lpsp:
- {shard-rkl}: [SKIP][19] ([i915#1397]) -> [PASS][20]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13027/shard-rkl-1/igt@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116684v1/shard-rkl-7/igt@[email protected]

* igt@i915_pm_rpm@dpms-non-lpsp:
- {shard-dg1}: [SKIP][21] ([i915#1397]) -> [PASS][22] +1 similar issue
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13027/shard-dg1-14/igt@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116684v1/shard-dg1-15/igt@[email protected]

* igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size:
- shard-apl: [FAIL][23] ([i915#2346]) -> [PASS][24]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13027/shard-apl4/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116684v1/shard-apl7/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html
- shard-glk: [FAIL][25] ([i915#2346]) -> [PASS][26]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13027/shard-glk7/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116684v1/shard-glk2/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html

* igt@kms_cursor_legacy@forked-bo@pipe-b:
- {shard-dg1}: [INCOMPLETE][27] ([i915#8011] / [i915#8347]) -> [PASS][28]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13027/shard-dg1-14/igt@kms_cursor_legacy@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116684v1/shard-dg1-15/igt@kms_cursor_legacy@[email protected]

* igt@kms_cursor_legacy@single-bo@pipe-b:
- {shard-rkl}: [INCOMPLETE][29] ([i915#8011]) -> [PASS][30]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13027/shard-rkl-7/igt@kms_cursor_legacy@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116684v1/shard-rkl-3/igt@kms_cursor_legacy@[email protected]

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

[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109289]: https://bugs.freedesktop.org/show_bug.cgi?id=109289
[fdo#109295]: https://bugs.freedesktop.org/show_bug.cgi?id=109295
[fdo#109309]: https://bugs.freedesktop.org/show_bug.cgi?id=109309
[fdo#109506]: https://bugs.freedesktop.org/show_bug.cgi?id=109506
[fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068
[fdo#111615]: https://bugs.freedesktop.org/show_bug.cgi?id=111615
[fdo#111825]: https://bugs.freedesktop.org/show_bug.cgi?id=111825
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[fdo#112054]: https://bugs.freedesktop.org/show_bug.cgi?id=112054
[i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072
[i915#1397]: https://gitlab.freedesktop.org/drm/intel/issues/1397
[i915#1825]: https://gitlab.freedesktop.org/drm/intel/issues/1825
[i915#1839]: https://gitlab.freedesktop.org/drm/intel/issues/1839
[i915#2346]: https://gitlab.freedesktop.org/drm/intel/issues/2346
[i915#2437]: https://gitlab.freedesktop.org/drm/intel/issues/2437
[i915#2527]: https://gitlab.freedesktop.org/drm/intel/issues/2527
[i915#2575]: https://gitlab.freedesktop.org/drm/intel/issues/2575
[i915#2587]: https://gitlab.freedesktop.org/drm/intel/issues/2587
[i915#2672]: https://gitlab.freedesktop.org/drm/intel/issues/2672
[i915#2705]: https://gitlab.freedesktop.org/drm/intel/issues/2705
[i915#280]: https://gitlab.freedesktop.org/drm/intel/issues/280
[i915#2842]: https://gitlab.freedesktop.org/drm/intel/issues/2842
[i915#3023]: https://gitlab.freedesktop.org/drm/intel/issues/3023
[i915#3281]: https://gitlab.freedesktop.org/drm/intel/issues/3281
[i915#3282]: https://gitlab.freedesktop.org/drm/intel/issues/3282
[i915#3297]: https://gitlab.freedesktop.org/drm/intel/issues/3297
[i915#3359]: https://gitlab.freedesktop.org/drm/intel/issues/3359
[i915#3458]: https://gitlab.freedesktop.org/drm/intel/issues/3458
[i915#3528]: https://gitlab.freedesktop.org/drm/intel/issues/3528
[i915#3539]: https://gitlab.freedesktop.org/drm/intel/issues/3539
[i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555
[i915#3689]: https://gitlab.freedesktop.org/drm/intel/issues/3689
[i915#3708]: https://gitlab.freedesktop.org/drm/intel/issues/3708
[i915#3742]: https://gitlab.freedesktop.org/drm/intel/issues/3742
[i915#3778]: https://gitlab.freedesktop.org/drm/intel/issues/3778
[i915#3840]: https://gitlab.freedesktop.org/drm/intel/issues/3840
[i915#3886]: https://gitlab.freedesktop.org/drm/intel/issues/3886
[i915#4070]: https://gitlab.freedesktop.org/drm/intel/issues/4070
[i915#4077]: https://gitlab.freedesktop.org/drm/intel/issues/4077
[i915#4078]: https://gitlab.freedesktop.org/drm/intel/issues/4078
[i915#4083]: https://gitlab.freedesktop.org/drm/intel/issues/4083
[i915#4103]: https://gitlab.freedesktop.org/drm/intel/issues/4103
[i915#4212]: https://gitlab.freedesktop.org/drm/intel/issues/4212
[i915#4213]: https://gitlab.freedesktop.org/drm/intel/issues/4213
[i915#4270]: https://gitlab.freedesktop.org/drm/intel/issues/4270
[i915#4281]: https://gitlab.freedesktop.org/drm/intel/issues/4281
[i915#4349]: https://gitlab.freedesktop.org/drm/intel/issues/4349
[i915#4538]: https://gitlab.freedesktop.org/drm/intel/issues/4538
[i915#4565]: https://gitlab.freedesktop.org/drm/intel/issues/4565
[i915#4579]: https://gitlab.freedesktop.org/drm/intel/issues/4579
[i915#4812]: https://gitlab.freedesktop.org/drm/intel/issues/4812
[i915#4833]: https://gitlab.freedesktop.org/drm/intel/issues/4833
[i915#4852]: https://gitlab.freedesktop.org/drm/intel/issues/4852
[i915#4859]: https://gitlab.freedesktop.org/drm/intel/issues/4859
[i915#4860]: https://gitlab.freedesktop.org/drm/intel/issues/4860
[i915#4880]: https://gitlab.freedesktop.org/drm/intel/issues/4880
[i915#4936]: https://gitlab.freedesktop.org/drm/intel/issues/4936
[i915#5176]: https://gitlab.freedesktop.org/drm/intel/issues/5176
[i915#5213]: https://gitlab.freedesktop.org/drm/intel/issues/5213
[i915#5235]: https://gitlab.freedesktop.org/drm/intel/issues/5235
[i915#5286]: https://gitlab.freedesktop.org/drm/intel/issues/5286
[i915#5288]: https://gitlab.freedesktop.org/drm/intel/issues/5288
[i915#5289]: https://gitlab.freedesktop.org/drm/intel/issues/5289
[i915#533]: https://gitlab.freedesktop.org/drm/intel/issues/533
[i915#5354]: https://gitlab.freedesktop.org/drm/intel/issues/5354
[i915#5493]: https://gitlab.freedesktop.org/drm/intel/issues/5493
[i915#5563]: https://gitlab.freedesktop.org/drm/intel/issues/5563
[i915#5566]: https://gitlab.freedesktop.org/drm/intel/issues/5566
[i915#6095]: https://gitlab.freedesktop.org/drm/intel/issues/6095
[i915#6230]: https://gitlab.freedesktop.org/drm/intel/issues/6230
[i915#6245]: https://gitlab.freedesktop.org/drm/intel/issues/6245
[i915#6301]: https://gitlab.freedesktop.org/drm/intel/issues/6301
[i915#6334]: https://gitlab.freedesktop.org/drm/intel/issues/6334
[i915#6524]: https://gitlab.freedesktop.org/drm/intel/issues/6524
[i915#658]: https://gitlab.freedesktop.org/drm/intel/issues/658
[i915#6768]: https://gitlab.freedesktop.org/drm/intel/issues/6768
[i915#6946]: https://gitlab.freedesktop.org/drm/intel/issues/6946
[i915#7116]: https://gitlab.freedesktop.org/drm/intel/issues/7116
[i915#7561]: https://gitlab.freedesktop.org/drm/intel/issues/7561
[i915#7697]: https://gitlab.freedesktop.org/drm/intel/issues/7697
[i915#7701]: https://gitlab.freedesktop.org/drm/intel/issues/7701
[i915#7711]: https://gitlab.freedesktop.org/drm/intel/issues/7711
[i915#7828]: https://gitlab.freedesktop.org/drm/intel/issues/7828
[i915#7975]: https://gitlab.freedesktop.org/drm/intel/issues/7975
[i915#8011]: https://gitlab.freedesktop.org/drm/intel/issues/8011
[i915#8211]: https://gitlab.freedesktop.org/drm/intel/issues/8211
[i915#8213]: https://gitlab.freedesktop.org/drm/intel/issues/8213
[i915#8234]: https://gitlab.freedesktop.org/drm/intel/issues/8234
[i915#8292]: https://gitlab.freedesktop.org/drm/intel/issues/8292
[i915#8347]: https://gitlab.freedesktop.org/drm/intel/issues/8347
[i915#8371]: https://gitlab.freedesktop.org/drm/intel/issues/8371

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

* Linux: CI_DRM_13027 -> Patchwork_116684v1

CI-20190529: 20190529
CI_DRM_13027: 9e1eb302fc69b5d8dc662f1ce7ed8684e87c5751 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7259: 3d3a7f1c041d3f8d84d7457abf96adef0ea071cb @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_116684v1: 9e1eb302fc69b5d8dc662f1ce7ed8684e87c5751 @ 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_116684v1/index.html

Reviewed-by on v1 1/1
#3 lore raw
In reply to Jani Nikula
Quoted 16 lines · Jani Nikula

A lot of places include i915_reg.h implicitly via i915_irq.h, which gets included implicitly via intel_display_trace.h. Remove the includes from the headers, and include i915_reg.h and i915_irq.h explicitly where needed.

---
  drivers/gpu/drm/i915/display/i9xx_wm.c                  | 1 +
  drivers/gpu/drm/i915/display/intel_atomic_plane.c       | 1 +
  drivers/gpu/drm/i915/display/intel_display_power.c      | 1 +
  drivers/gpu/drm/i915/display/intel_display_power_well.c | 1 +
  drivers/gpu/drm/i915/display/intel_display_trace.h      | 1 -
  drivers/gpu/drm/i915/display/intel_fbc.c                | 1 +
  drivers/gpu/drm/i915/display/intel_fifo_underrun.c      | 2 ++
  drivers/gpu/drm/i915/gt/intel_gt_irq.c                  | 1 +
  drivers/gpu/drm/i915/gt/intel_reset.c                   | 1 +
Quoted 8 lines
  drivers/gpu/drm/i915/gt/intel_rps.c                     | 1 +
  drivers/gpu/drm/i915/gt/selftest_rps.c                  | 1 +
  drivers/gpu/drm/i915/gt/uc/intel_guc.c                  | 1 +
  drivers/gpu/drm/i915/i915_debugfs.c                     | 1 +
  drivers/gpu/drm/i915/i915_irq.c                         | 1 +
  drivers/gpu/drm/i915/i915_irq.h                         | 2 +-
  drivers/gpu/drm/i915/intel_clock_gating.c               | 1 +
  16 files changed, 16 insertions(+), 2 deletions(-)

I see the same is for i915_drv.h included imlicitly via intel_display_trace.h, I guess this is not the last case.

Regards
Andrzej

Quoted 195 lines
drivers/gpu/drm/i915/display/i9xx_wm.c +1 -0
index 6288826a9497..af0c79a4c9a4 100644
@@ -4,6 +4,7 @@
   */
 
  #include "i915_drv.h"
+#include "i915_reg.h"
  #include "i9xx_wm.h"
  #include "intel_atomic.h"
  #include "intel_display.h"
drivers/gpu/drm/i915/display/intel_atomic_plane.c +1 -0
index 40de9f0f171b..9f670dcfe76e 100644
@@ -36,6 +36,7 @@
  #include <drm/drm_fourcc.h>
 
  #include "i915_config.h"
+#include "i915_reg.h"
  #include "intel_atomic_plane.h"
  #include "intel_cdclk.h"
  #include "intel_display_rps.h"
drivers/gpu/drm/i915/display/intel_display_power.c +1 -0
index 7c9f4288329e..5150069f3f82 100644
@@ -7,6 +7,7 @@
 
  #include "i915_drv.h"
  #include "i915_irq.h"
+#include "i915_reg.h"
  #include "intel_backlight_regs.h"
  #include "intel_cdclk.h"
  #include "intel_combo_phy.h"
drivers/gpu/drm/i915/display/intel_display_power_well.c +1 -0
index 62bafcbc7937..1a19fd3bf103 100644
@@ -5,6 +5,7 @@
 
  #include "i915_drv.h"
  #include "i915_irq.h"
+#include "i915_reg.h"
  #include "intel_backlight_regs.h"
  #include "intel_combo_phy.h"
  #include "intel_combo_phy_regs.h"
drivers/gpu/drm/i915/display/intel_display_trace.h +0 -1
index 651ea8564e1b..99bdb833591c 100644
@@ -14,7 +14,6 @@
  #include <linux/tracepoint.h>
 
  #include "i915_drv.h"
-#include "i915_irq.h"
  #include "intel_crtc.h"
  #include "intel_display_types.h"
  #include "intel_vblank.h"
drivers/gpu/drm/i915/display/intel_fbc.c +1 -0
index b507ff944864..11bb8cf9c9d0 100644
@@ -44,6 +44,7 @@
  #include <drm/drm_fourcc.h>
 
  #include "i915_drv.h"
+#include "i915_reg.h"
  #include "i915_utils.h"
  #include "i915_vgpu.h"
  #include "intel_cdclk.h"
drivers/gpu/drm/i915/display/intel_fifo_underrun.c +2 -0
index b708a62e509a..e7f77a225739 100644
@@ -26,6 +26,8 @@
   */
 
  #include "i915_drv.h"
+#include "i915_reg.h"
+#include "i915_irq.h"
  #include "intel_de.h"
  #include "intel_display_trace.h"
  #include "intel_display_types.h"
drivers/gpu/drm/i915/gt/intel_gt_irq.c +1 -0
index 1b25a6039152..c0f3ff4746ad 100644
@@ -7,6 +7,7 @@
 
  #include "i915_drv.h"
  #include "i915_irq.h"
+#include "i915_reg.h"
  #include "intel_breadcrumbs.h"
  #include "intel_gt.h"
  #include "intel_gt_irq.h"
drivers/gpu/drm/i915/gt/intel_reset.c +1 -0
index 6194212e8650..195ff72d7a14 100644
@@ -20,6 +20,7 @@
  #include "i915_file_private.h"
  #include "i915_gpu_error.h"
  #include "i915_irq.h"
+#include "i915_reg.h"
  #include "intel_breadcrumbs.h"
  #include "intel_engine_pm.h"
  #include "intel_engine_regs.h"
drivers/gpu/drm/i915/gt/intel_rps.c +1 -0
index b2671ac59dc0..80968e49e2c3 100644
@@ -10,6 +10,7 @@
  #include "display/intel_display.h"
  #include "i915_drv.h"
  #include "i915_irq.h"
+#include "i915_reg.h"
  #include "intel_breadcrumbs.h"
  #include "intel_gt.h"
  #include "intel_gt_clock_utils.h"
drivers/gpu/drm/i915/gt/selftest_rps.c +1 -0
index 84e77e8dbba1..fb30f733b036 100644
@@ -8,6 +8,7 @@
 
  #include "gem/i915_gem_internal.h"
 
+#include "i915_reg.h"
  #include "intel_engine_heartbeat.h"
  #include "intel_engine_pm.h"
  #include "intel_engine_regs.h"
drivers/gpu/drm/i915/gt/uc/intel_guc.c +1 -0
index d76508fa3af7..e89f16ecf1ae 100644
@@ -16,6 +16,7 @@
  #include "intel_guc_submission.h"
  #include "i915_drv.h"
  #include "i915_irq.h"
+#include "i915_reg.h"
 
  /**
   * DOC: GuC
drivers/gpu/drm/i915/i915_debugfs.c +1 -0
index 80c2bf98e341..41389a32e998 100644
@@ -50,6 +50,7 @@
  #include "i915_debugfs_params.h"
  #include "i915_driver.h"
  #include "i915_irq.h"
+#include "i915_reg.h"
  #include "i915_scheduler.h"
  #include "intel_mchbar_regs.h"
 
drivers/gpu/drm/i915/i915_irq.c +1 -0
index ff2f1b115ba1..2b94b8ca8ec9 100644
@@ -54,6 +54,7 @@
  #include "i915_driver.h"
  #include "i915_drv.h"
  #include "i915_irq.h"
+#include "i915_reg.h"
 
  /**
   * DOC: interrupt handling
drivers/gpu/drm/i915/i915_irq.h +1 -1
index 3717a66f97c6..dd47e473ba4f 100644
@@ -9,7 +9,7 @@
  #include <linux/ktime.h>
  #include <linux/types.h>
 
-#include "i915_reg.h"
+#include "i915_reg_defs.h"
 
  enum pipe;
  struct drm_crtc;
drivers/gpu/drm/i915/intel_clock_gating.c +1 -0
index 2c5302bcba19..1d796b76f71b 100644
@@ -36,6 +36,7 @@
  #include "gt/intel_gt_regs.h"
 
  #include "i915_drv.h"
+#include "i915_reg.h"
  #include "intel_clock_gating.h"
  #include "intel_mchbar_regs.h"
  #include "vlv_sideband.h"
#4 lore raw
Quoted 26 lines · Andrzej Hajda
Quoted 16 lines · Jani Nikula

A lot of places include i915_reg.h implicitly via i915_irq.h, which gets included implicitly via intel_display_trace.h. Remove the includes from the headers, and include i915_reg.h and i915_irq.h explicitly where needed.

---
  drivers/gpu/drm/i915/display/i9xx_wm.c                  | 1 +
  drivers/gpu/drm/i915/display/intel_atomic_plane.c       | 1 +
  drivers/gpu/drm/i915/display/intel_display_power.c      | 1 +
  drivers/gpu/drm/i915/display/intel_display_power_well.c | 1 +
  drivers/gpu/drm/i915/display/intel_display_trace.h      | 1 -
  drivers/gpu/drm/i915/display/intel_fbc.c                | 1 +
  drivers/gpu/drm/i915/display/intel_fifo_underrun.c      | 2 ++
  drivers/gpu/drm/i915/gt/intel_gt_irq.c                  | 1 +
  drivers/gpu/drm/i915/gt/intel_reset.c                   | 1 +
Quoted 8 lines
  drivers/gpu/drm/i915/gt/intel_rps.c                     | 1 +
  drivers/gpu/drm/i915/gt/selftest_rps.c                  | 1 +
  drivers/gpu/drm/i915/gt/uc/intel_guc.c                  | 1 +
  drivers/gpu/drm/i915/i915_debugfs.c                     | 1 +
  drivers/gpu/drm/i915/i915_irq.c                         | 1 +
  drivers/gpu/drm/i915/i915_irq.h                         | 2 +-
  drivers/gpu/drm/i915/intel_clock_gating.c               | 1 +
  16 files changed, 16 insertions(+), 2 deletions(-)
Quoted 2 lines

I see the same is for i915_drv.h included imlicitly via intel_display_trace.h, I guess this is not the last case.

Yeah, but that's harder to drop. All roads lead to i915_drv.h. ;)

Quoted 1 line

Thanks, pushed to drm-intel-next.

BR,
Jani.

Quoted 200 lines

Regards
Andrzej

Quoted 195 lines
drivers/gpu/drm/i915/display/i9xx_wm.c +1 -0
index 6288826a9497..af0c79a4c9a4 100644
@@ -4,6 +4,7 @@
   */
 
  #include "i915_drv.h"
+#include "i915_reg.h"
  #include "i9xx_wm.h"
  #include "intel_atomic.h"
  #include "intel_display.h"
drivers/gpu/drm/i915/display/intel_atomic_plane.c +1 -0
index 40de9f0f171b..9f670dcfe76e 100644
@@ -36,6 +36,7 @@
  #include <drm/drm_fourcc.h>
 
  #include "i915_config.h"
+#include "i915_reg.h"
  #include "intel_atomic_plane.h"
  #include "intel_cdclk.h"
  #include "intel_display_rps.h"
drivers/gpu/drm/i915/display/intel_display_power.c +1 -0
index 7c9f4288329e..5150069f3f82 100644
@@ -7,6 +7,7 @@
 
  #include "i915_drv.h"
  #include "i915_irq.h"
+#include "i915_reg.h"
  #include "intel_backlight_regs.h"
  #include "intel_cdclk.h"
  #include "intel_combo_phy.h"
drivers/gpu/drm/i915/display/intel_display_power_well.c +1 -0
index 62bafcbc7937..1a19fd3bf103 100644
@@ -5,6 +5,7 @@
 
  #include "i915_drv.h"
  #include "i915_irq.h"
+#include "i915_reg.h"
  #include "intel_backlight_regs.h"
  #include "intel_combo_phy.h"
  #include "intel_combo_phy_regs.h"
drivers/gpu/drm/i915/display/intel_display_trace.h +0 -1
index 651ea8564e1b..99bdb833591c 100644
@@ -14,7 +14,6 @@
  #include <linux/tracepoint.h>
 
  #include "i915_drv.h"
-#include "i915_irq.h"
  #include "intel_crtc.h"
  #include "intel_display_types.h"
  #include "intel_vblank.h"
drivers/gpu/drm/i915/display/intel_fbc.c +1 -0
index b507ff944864..11bb8cf9c9d0 100644
@@ -44,6 +44,7 @@
  #include <drm/drm_fourcc.h>
 
  #include "i915_drv.h"
+#include "i915_reg.h"
  #include "i915_utils.h"
  #include "i915_vgpu.h"
  #include "intel_cdclk.h"
drivers/gpu/drm/i915/display/intel_fifo_underrun.c +2 -0
index b708a62e509a..e7f77a225739 100644
@@ -26,6 +26,8 @@
   */
 
  #include "i915_drv.h"
+#include "i915_reg.h"
+#include "i915_irq.h"
  #include "intel_de.h"
  #include "intel_display_trace.h"
  #include "intel_display_types.h"
drivers/gpu/drm/i915/gt/intel_gt_irq.c +1 -0
index 1b25a6039152..c0f3ff4746ad 100644
@@ -7,6 +7,7 @@
 
  #include "i915_drv.h"
  #include "i915_irq.h"
+#include "i915_reg.h"
  #include "intel_breadcrumbs.h"
  #include "intel_gt.h"
  #include "intel_gt_irq.h"
drivers/gpu/drm/i915/gt/intel_reset.c +1 -0
index 6194212e8650..195ff72d7a14 100644
@@ -20,6 +20,7 @@
  #include "i915_file_private.h"
  #include "i915_gpu_error.h"
  #include "i915_irq.h"
+#include "i915_reg.h"
  #include "intel_breadcrumbs.h"
  #include "intel_engine_pm.h"
  #include "intel_engine_regs.h"
drivers/gpu/drm/i915/gt/intel_rps.c +1 -0
index b2671ac59dc0..80968e49e2c3 100644
@@ -10,6 +10,7 @@
  #include "display/intel_display.h"
  #include "i915_drv.h"
  #include "i915_irq.h"
+#include "i915_reg.h"
  #include "intel_breadcrumbs.h"
  #include "intel_gt.h"
  #include "intel_gt_clock_utils.h"
drivers/gpu/drm/i915/gt/selftest_rps.c +1 -0
index 84e77e8dbba1..fb30f733b036 100644
@@ -8,6 +8,7 @@
 
  #include "gem/i915_gem_internal.h"
 
+#include "i915_reg.h"
  #include "intel_engine_heartbeat.h"
  #include "intel_engine_pm.h"
  #include "intel_engine_regs.h"
drivers/gpu/drm/i915/gt/uc/intel_guc.c +1 -0
index d76508fa3af7..e89f16ecf1ae 100644
@@ -16,6 +16,7 @@
  #include "intel_guc_submission.h"
  #include "i915_drv.h"
  #include "i915_irq.h"
+#include "i915_reg.h"
 
  /**
   * DOC: GuC
drivers/gpu/drm/i915/i915_debugfs.c +1 -0
index 80c2bf98e341..41389a32e998 100644
@@ -50,6 +50,7 @@
  #include "i915_debugfs_params.h"
  #include "i915_driver.h"
  #include "i915_irq.h"
+#include "i915_reg.h"
  #include "i915_scheduler.h"
  #include "intel_mchbar_regs.h"
 
drivers/gpu/drm/i915/i915_irq.c +1 -0
index ff2f1b115ba1..2b94b8ca8ec9 100644
@@ -54,6 +54,7 @@
  #include "i915_driver.h"
  #include "i915_drv.h"
  #include "i915_irq.h"
+#include "i915_reg.h"
 
  /**
   * DOC: interrupt handling
drivers/gpu/drm/i915/i915_irq.h +1 -1
index 3717a66f97c6..dd47e473ba4f 100644
@@ -9,7 +9,7 @@
  #include <linux/ktime.h>
  #include <linux/types.h>
 
-#include "i915_reg.h"
+#include "i915_reg_defs.h"
 
  enum pipe;
  struct drm_crtc;
drivers/gpu/drm/i915/intel_clock_gating.c +1 -0
index 2c5302bcba19..1d796b76f71b 100644
@@ -36,6 +36,7 @@
  #include "gt/intel_gt_regs.h"
 
  #include "i915_drv.h"
+#include "i915_reg.h"
  #include "intel_clock_gating.h"
  #include "intel_mchbar_regs.h"
  #include "vlv_sideband.h"
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center