drm/i915/display: add intel_display_limits.h for key enums
Subsystems (4)
RFC 1/1 drm/i915/display: add intel_display_limits.h for key enums
Move a handful of key enums to a new file intel_display_limits.h. These are the enum types, and the MAX/NUM enumerations within them, that are used in other headers. Otherwise, there's no common theme between them.
Replace intel_display.h include with intel_display_limit.h where relevant, and add the intel_display.h include directly in the .c files where needed.
Since intel_display.h is used almost everywhere in display/, include it from intel_display_types.h to avoid massive changes across the board. There are very few files that would need intel_display_types.h but not intel_display.h so this is neglible, and further cleanup between these headers can be left for the future.
Overall this change drops the direct and indirect dependencies on intel_display.h from about 300 to about 100 compilation units.
---
N.b. intel_display_limits.h is not a great name. I was hoping it was only needed for the MAX/NUM enumerations such as I915_MAX_PIPES but there are a number of headers that use the types for struct members as well. intel_display_enums.h sounds too generic too. Suggestions?
--- drivers/gpu/drm/i915/display/intel_bw.h | 2 +- drivers/gpu/drm/i915/display/intel_cdclk.h | 2 +- drivers/gpu/drm/i915/display/intel_display.h | 115 +--------------- .../gpu/drm/i915/display/intel_display_core.h | 2 +- .../drm/i915/display/intel_display_limits.h | 124 ++++++++++++++++++ .../i915/display/intel_display_power_map.c | 1 + .../drm/i915/display/intel_display_types.h | 1 + drivers/gpu/drm/i915/display/intel_dvo_dev.h | 2 +- drivers/gpu/drm/i915/display/skl_watermark.h | 2 +- drivers/gpu/drm/i915/gem/i915_gem_create.c | 1 + drivers/gpu/drm/i915/gt/intel_ggtt.c | 1 + drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c | 1 + drivers/gpu/drm/i915/gt/intel_rps.c | 1 + drivers/gpu/drm/i915/gvt/cmd_parser.c | 1 + drivers/gpu/drm/i915/gvt/display.c | 1 + drivers/gpu/drm/i915/gvt/fb_decoder.h | 2 +- drivers/gpu/drm/i915/i915_drv.h | 2 +- drivers/gpu/drm/i915/i915_pci.c | 1 + drivers/gpu/drm/i915/i915_vma.c | 1 + drivers/gpu/drm/i915/intel_device_info.c | 1 + drivers/gpu/drm/i915/intel_device_info.h | 2 +- drivers/gpu/drm/i915/intel_gvt_mmio_table.c | 1 + drivers/gpu/drm/i915/intel_pm.c | 1 + drivers/gpu/drm/i915/intel_pm_types.h | 2 +- drivers/gpu/drm/i915/vlv_sideband.c | 1 + 25 files changed, 148 insertions(+), 123 deletions(-) create mode 100644 drivers/gpu/drm/i915/display/intel_display_limits.h
drivers/gpu/drm/i915/display/intel_bw.h +1 -1
@@ -8,7 +8,7 @@#include <drm/drm_atomic.h> -#include "intel_display.h" +#include "intel_display_limits.h" #include "intel_display_power.h" #include "intel_global_state.h"
drivers/gpu/drm/i915/display/intel_cdclk.h +1 -1
@@ -8,7 +8,7 @@#include <linux/types.h> -#include "intel_display.h" +#include "intel_display_limits.h" #include "intel_global_state.h" struct drm_i915_private ;
drivers/gpu/drm/i915/display/intel_display.h +1 -114
148 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_display_core.h +1 -1
@@ -17,7 +17,7 @@#include <drm/drm_modeset_lock.h> #include "intel_cdclk.h" -#include "intel_display.h" +#include "intel_display_limits.h" #include "intel_display_power.h" #include "intel_dmc.h" #include "intel_dpll_mgr.h"
drivers/gpu/drm/i915/display/intel_display_limits.h new file +124 -0
124 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_display_power_map.c +1 -0
@@ -10,6 +10,7 @@#include "intel_display_power_map.h" #include "intel_display_power_well.h" +#include "intel_display_types.h" #define __LIST_INLINE_ELEMS (__elem_type, ...) \ ((__elem_type[]) { __VA_ARGS__ })
drivers/gpu/drm/i915/display/intel_display_types.h +1 -0
@@ -50,6 +50,7 @@#include "i915_vma_types.h" #include "intel_bios.h" #include "intel_display.h" +#include "intel_display_limits.h" #include "intel_display_power.h" #include "intel_dpll_mgr.h" #include "intel_pm_types.h"
drivers/gpu/drm/i915/display/intel_dvo_dev.h +1 -1
@@ -25,7 +25,7 @@#include "i915_reg_defs.h" -#include "intel_display.h" +#include "intel_display_limits.h" enum drm_connector_status ;struct drm_display_mode ;
drivers/gpu/drm/i915/display/skl_watermark.h +1 -1
@@ -8,7 +8,7 @@#include <linux/types.h> -#include "intel_display.h" +#include "intel_display_limits.h" #include "intel_global_state.h" #include "intel_pm_types.h"
drivers/gpu/drm/i915/gem/i915_gem_create.c +1 -0
@@ -5,6 +5,7 @@#include <drm/drm_fourcc.h> +#include "display/intel_display.h" #include "gem/i915_gem_ioctls.h" #include "gem/i915_gem_lmem.h" #include "gem/i915_gem_region.h"
drivers/gpu/drm/i915/gt/intel_ggtt.c +1 -0
@@ -11,6 +11,7 @@#include <drm/i915_drm.h> #include <drm/intel-gtt.h> +#include "display/intel_display.h" #include "gem/i915_gem_lmem.h" #include "intel_ggtt_gmch.h"
drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c +1 -0
@@ -5,6 +5,7 @@#include <linux/highmem.h> +#include "display/intel_display.h" #include "i915_drv.h" #include "i915_reg.h" #include "i915_scatterlist.h"
drivers/gpu/drm/i915/gt/intel_rps.c +1 -0
@@ -7,6 +7,7 @@#include <drm/i915_drm.h> +#include "display/intel_display.h" #include "i915_drv.h" #include "i915_irq.h" #include "intel_breadcrumbs.h"
drivers/gpu/drm/i915/gvt/cmd_parser.c +1 -0
@@ -49,6 +49,7 @@#include "i915_pvinfo.h" #include "trace.h" +#include "display/intel_display.h" #include "gem/i915_gem_context.h" #include "gem/i915_gem_pm.h" #include "gt/intel_context.h"
drivers/gpu/drm/i915/gvt/display.c +1 -0
@@ -36,6 +36,7 @@#include "i915_reg.h" #include "gvt.h" +#include "display/intel_display.h" #include "display/intel_dpio_phy.h" static int get_edp_pipe (struct intel_vgpu *vgpu)
drivers/gpu/drm/i915/gvt/fb_decoder.h +1 -1
@@ -38,7 +38,7 @@#include <linux/types.h> -#include "display/intel_display.h" +#include "display/intel_display_limits.h" struct intel_vgpu ;
drivers/gpu/drm/i915/i915_drv.h +1 -1
@@ -36,7 +36,7 @@#include <drm/ttm/ttm_device.h> -#include "display/intel_display.h" +#include "display/intel_display_limits.h" #include "display/intel_display_core.h" #include "gem/i915_gem_context_types.h"
drivers/gpu/drm/i915/i915_pci.c +1 -0
@@ -26,6 +26,7 @@#include <drm/drm_drv.h> #include <drm/i915_pciids.h> +#include "display/intel_display.h" #include "gt/intel_gt_regs.h" #include "gt/intel_sa_media.h"
drivers/gpu/drm/i915/i915_vma.c +1 -0
@@ -26,6 +26,7 @@#include <linux/dma-fence-array.h> #include <drm/drm_gem.h> +#include "display/intel_display.h" #include "display/intel_frontbuffer.h" #include "gem/i915_gem_lmem.h" #include "gem/i915_gem_tiling.h"
drivers/gpu/drm/i915/intel_device_info.c +1 -0
@@ -29,6 +29,7 @@#include "display/intel_cdclk.h" #include "display/intel_de.h" +#include "display/intel_display.h" #include "gt/intel_gt_regs.h" #include "i915_drv.h" #include "i915_reg.h"
drivers/gpu/drm/i915/intel_device_info.h +1 -1
@@ -29,7 +29,7 @@#include "intel_step.h" -#include "display/intel_display.h" +#include "display/intel_display_limits.h" #include "gt/intel_engine_types.h" #include "gt/intel_context_types.h"
drivers/gpu/drm/i915/intel_gvt_mmio_table.c +1 -0
@@ -5,6 +5,7 @@#include "display/intel_audio_regs.h" #include "display/intel_backlight_regs.h" +#include "display/intel_display_types.h" #include "display/intel_dmc_regs.h" #include "display/intel_dpio_phy.h" #include "display/vlv_dsi_pll_regs.h"
drivers/gpu/drm/i915/intel_pm.c +1 -0
@@ -26,6 +26,7 @@*/ #include "display/intel_de.h" +#include "display/intel_display.h" #include "display/intel_display_trace.h" #include "display/skl_watermark.h"
drivers/gpu/drm/i915/intel_pm_types.h +1 -1
@@ -8,7 +8,7 @@#include <linux/types.h> -#include "display/intel_display.h" +#include "display/intel_display_limits.h" enum intel_ddb_partitioning {INTEL_DDB_PART_1_2 ,
drivers/gpu/drm/i915/vlv_sideband.c +1 -0
@@ -9,6 +9,7 @@#include "vlv_sideband.h" #include "display/intel_dpio_phy.h" +#include "display/intel_display_types.h" /* * IOSF sideband, see VLV2_SidebandMsg_HAS.docx and
Signature · 1 line
2.34.1
Patchwork
CI[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915/display: add intel_display_limits.h for key enums
== Series Details ==
== Series Details ==
Series: drm/i915/display: add intel_display_limits.h for key enums
URL : https://patchwork.freedesktop.org/series/111334/
State : warning
== Summary ==
Error: dim checkpatch failed721cfeb5e38c drm/i915/display: add intel_display_limits.h for key enums
Traceback (most recent call last):
File "scripts/spdxcheck.py", line 11, in <module>
import git
ModuleNotFoundError: No module named 'git'
-:222: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating? #222:
new file mode 100644
total: 0 errors, 1 warnings, 0 checks, 442 lines checked
Patchwork
CI[Intel-gfx] ✗ Fi.CI.SPARSE: warning for drm/i915/display: add intel_display_limits.h for key enums
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/i915/display: add intel_display_limits.h for key enums
URL : https://patchwork.freedesktop.org/series/111334/
State : warning
== Summary ==
Error: dim sparse failed
Sparse version: v0.6.2
Fast mode used, each commit won't be checked separately.
Patchwork
CI[Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/display: add intel_display_limits.h for key enums
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/i915/display: add intel_display_limits.h for key enums
URL : https://patchwork.freedesktop.org/series/111334/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_12434 -> Patchwork_111334v1
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111334v1/index.html
Participating hosts (36 -> 37)
------------------------------
Additional (3): fi-bdw-gvtdvm fi-cfl-guc bat-dg1-6
Missing (2): fi-ctg-p8600 bat-rpls-2
Known issues
------------
Here are the changes found in Patchwork_111334v1 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_lmem_swapping@verify-random:
- fi-cfl-guc: NOTRUN -> [SKIP][1] ([fdo#109271] / [i915#4613]) +3 similar issues
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111334v1/fi-cfl-guc/igt@[email protected]
* igt@gem_mmap@basic:
- bat-dg1-6: NOTRUN -> [SKIP][2] ([i915#4083])
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111334v1/bat-dg1-6/igt@[email protected]
* igt@gem_render_tiled_blits@basic:
- bat-dg1-6: NOTRUN -> [SKIP][3] ([i915#4079]) +1 similar issue
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111334v1/bat-dg1-6/igt@[email protected]
* igt@gem_tiled_blits@basic:
- fi-pnv-d510: [PASS][4] -> [SKIP][5] ([fdo#109271]) +1 similar issue
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12434/fi-pnv-d510/igt@[email protected]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111334v1/fi-pnv-d510/igt@[email protected]
* igt@gem_tiled_fence_blits@basic:
- bat-dg1-6: NOTRUN -> [SKIP][6] ([i915#4077]) +2 similar issues
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111334v1/bat-dg1-6/igt@[email protected]
* igt@i915_pm_backlight@basic-brightness:
- bat-dg1-6: NOTRUN -> [SKIP][7] ([i915#7561])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111334v1/bat-dg1-6/igt@[email protected]
* igt@i915_pm_rps@basic-api:
- bat-dg1-6: NOTRUN -> [SKIP][8] ([i915#6621])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111334v1/bat-dg1-6/igt@[email protected]
* igt@i915_suspend@basic-s2idle-without-i915:
- fi-bdw-gvtdvm: NOTRUN -> [INCOMPLETE][9] ([i915#146])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111334v1/fi-bdw-gvtdvm/igt@[email protected]
* igt@i915_suspend@basic-s3-without-i915:
- fi-rkl-11600: [PASS][10] -> [FAIL][11] ([fdo#103375]) +1 similar issue
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12434/fi-rkl-11600/igt@[email protected]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111334v1/fi-rkl-11600/igt@[email protected]
* igt@kms_addfb_basic@basic-y-tiled-legacy:
- bat-dg1-6: NOTRUN -> [SKIP][12] ([i915#4215])
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111334v1/bat-dg1-6/igt@[email protected]
* igt@kms_addfb_basic@tile-pitch-mismatch:
- bat-dg1-6: NOTRUN -> [SKIP][13] ([i915#4212]) +7 similar issues
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111334v1/bat-dg1-6/igt@[email protected]
* igt@kms_chamelium@dp-crc-fast:
- fi-cfl-guc: NOTRUN -> [SKIP][14] ([fdo#109271] / [fdo#111827]) +8 similar issues
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111334v1/fi-cfl-guc/igt@[email protected]
* igt@kms_chamelium@hdmi-crc-fast:
- bat-dg1-6: NOTRUN -> [SKIP][15] ([fdo#111827]) +8 similar issues
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111334v1/bat-dg1-6/igt@[email protected]
* igt@kms_chamelium@hdmi-hpd-fast:
- fi-bdw-gvtdvm: NOTRUN -> [SKIP][16] ([fdo#109271] / [fdo#111827]) +7 similar issues
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111334v1/fi-bdw-gvtdvm/igt@[email protected]
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor:
- bat-dg1-6: NOTRUN -> [SKIP][17] ([i915#4103] / [i915#4213])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111334v1/bat-dg1-6/igt@[email protected]
* igt@kms_flip@basic-plain-flip:
- fi-bdw-gvtdvm: NOTRUN -> [SKIP][18] ([fdo#109271]) +38 similar issues
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111334v1/fi-bdw-gvtdvm/igt@[email protected]
* igt@kms_force_connector_basic@force-load-detect:
- bat-dg1-6: NOTRUN -> [SKIP][19] ([fdo#109285])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111334v1/bat-dg1-6/igt@[email protected]
* igt@kms_psr@sprite_plane_onoff:
- bat-dg1-6: NOTRUN -> [SKIP][20] ([i915#1072] / [i915#4078]) +3 similar issues
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111334v1/bat-dg1-6/igt@kms_psr@sprite_plane_onoff.html
* igt@kms_setmode@basic-clone-single-crtc:
- bat-dg1-6: NOTRUN -> [SKIP][21] ([i915#3555])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111334v1/bat-dg1-6/igt@[email protected]
* igt@prime_vgem@basic-gtt:
- bat-dg1-6: NOTRUN -> [SKIP][22] ([i915#3708] / [i915#4077]) +1 similar issue
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111334v1/bat-dg1-6/igt@[email protected]
* igt@prime_vgem@basic-read:
- bat-dg1-6: NOTRUN -> [SKIP][23] ([i915#3708]) +3 similar issues
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111334v1/bat-dg1-6/igt@[email protected]
* igt@prime_vgem@basic-userptr:
- fi-cfl-guc: NOTRUN -> [SKIP][24] ([fdo#109271]) +9 similar issues
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111334v1/fi-cfl-guc/igt@[email protected]
- bat-dg1-6: NOTRUN -> [SKIP][25] ([i915#3708] / [i915#4873])
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111334v1/bat-dg1-6/igt@[email protected]
#### Possible fixes ####
* igt@gem_exec_suspend@basic-s0@smem:
- {bat-rplp-1}: [DMESG-WARN][26] ([i915#2867]) -> [PASS][27]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12434/bat-rplp-1/igt@gem_exec_suspend@[email protected]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111334v1/bat-rplp-1/igt@gem_exec_suspend@[email protected]
* igt@i915_selftest@live@requests:
- {bat-rpls-1}: [INCOMPLETE][28] ([i915#4983] / [i915#6257]) -> [PASS][29]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12434/bat-rpls-1/igt@i915_selftest@[email protected]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111334v1/bat-rpls-1/igt@i915_selftest@[email protected]
#### Warnings ####
* igt@gem_exec_gttfill@basic:
- fi-pnv-d510: [FAIL][30] ([i915#7229]) -> [SKIP][31] ([fdo#109271])
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12434/fi-pnv-d510/igt@[email protected]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111334v1/fi-pnv-d510/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#103375]: https://bugs.freedesktop.org/show_bug.cgi?id=103375
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072
[i915#146]: https://gitlab.freedesktop.org/drm/intel/issues/146
[i915#2867]: https://gitlab.freedesktop.org/drm/intel/issues/2867
[i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555
[i915#3708]: https://gitlab.freedesktop.org/drm/intel/issues/3708
[i915#4077]: https://gitlab.freedesktop.org/drm/intel/issues/4077
[i915#4078]: https://gitlab.freedesktop.org/drm/intel/issues/4078
[i915#4079]: https://gitlab.freedesktop.org/drm/intel/issues/4079
[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#4215]: https://gitlab.freedesktop.org/drm/intel/issues/4215
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#4873]: https://gitlab.freedesktop.org/drm/intel/issues/4873
[i915#4983]: https://gitlab.freedesktop.org/drm/intel/issues/4983
[i915#5153]: https://gitlab.freedesktop.org/drm/intel/issues/5153
[i915#6106]: https://gitlab.freedesktop.org/drm/intel/issues/6106
[i915#6257]: https://gitlab.freedesktop.org/drm/intel/issues/6257
[i915#6367]: https://gitlab.freedesktop.org/drm/intel/issues/6367
[i915#6621]: https://gitlab.freedesktop.org/drm/intel/issues/6621
[i915#6687]: https://gitlab.freedesktop.org/drm/intel/issues/6687
[i915#7229]: https://gitlab.freedesktop.org/drm/intel/issues/7229
[i915#7561]: https://gitlab.freedesktop.org/drm/intel/issues/7561
Build changes
-------------
* Linux: CI_DRM_12434 -> Patchwork_111334v1
CI-20190529: 20190529
CI_DRM_12434: 985931f189852e505af573997ddbf63bfbe2570b @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7072: 69ba7163475925cdc69aebbdfa0e87453ae165c7 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_111334v1: 985931f189852e505af573997ddbf63bfbe2570b @ git://anongit.freedesktop.org/gfx-ci/linux
### Linux commits
ef3c2f5dbe90 drm/i915/display: add intel_display_limits.h for key enums
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111334v1/index.html