* [PATCH v2 2/3] drm/i915: move modesetting output/encoder code under display/
2019-06-13 8:44 [PATCH v2 1/3] drm/i915: make intel_sdvo_regs.h self-contained Jani Nikula
@ 2019-06-13 8:44 ` Jani Nikula
2019-06-13 8:44 ` [PATCH v2 3/3] drm/i915: move modesetting core " Jani Nikula
` (9 subsequent siblings)
10 siblings, 0 replies; 17+ messages in thread
From: Jani Nikula @ 2019-06-13 8:44 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula
Add a new subdirectory for display code, and start off by moving
modesetting output/encoder code. Judging by the include changes, this is
a surprisingly clean operation.
v2:
- move intel_sdvo_regs.h too
- use tabs for Makefile file lists and sort them
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/Makefile | 56 ++++++++++---------
| 19 -------
drivers/gpu/drm/i915/display/Makefile | 2 +
| 16 ++++++
.../gpu/drm/i915/{ => display}/dvo_ch7017.c | 0
.../gpu/drm/i915/{ => display}/dvo_ch7xxx.c | 0
drivers/gpu/drm/i915/{ => display}/dvo_ivch.c | 0
.../gpu/drm/i915/{ => display}/dvo_ns2501.c | 0
.../gpu/drm/i915/{ => display}/dvo_sil164.c | 0
.../gpu/drm/i915/{ => display}/dvo_tfp410.c | 0
drivers/gpu/drm/i915/{ => display}/icl_dsi.c | 0
.../gpu/drm/i915/{ => display}/intel_crt.c | 0
.../gpu/drm/i915/{ => display}/intel_crt.h | 0
.../gpu/drm/i915/{ => display}/intel_ddi.c | 0
.../gpu/drm/i915/{ => display}/intel_ddi.h | 0
drivers/gpu/drm/i915/{ => display}/intel_dp.c | 0
drivers/gpu/drm/i915/{ => display}/intel_dp.h | 0
.../{ => display}/intel_dp_aux_backlight.c | 0
.../{ => display}/intel_dp_aux_backlight.h | 0
.../{ => display}/intel_dp_link_training.c | 0
.../{ => display}/intel_dp_link_training.h | 0
.../gpu/drm/i915/{ => display}/intel_dp_mst.c | 0
.../gpu/drm/i915/{ => display}/intel_dp_mst.h | 0
.../gpu/drm/i915/{ => display}/intel_dsi.c | 0
.../gpu/drm/i915/{ => display}/intel_dsi.h | 0
.../{ => display}/intel_dsi_dcs_backlight.c | 0
.../{ => display}/intel_dsi_dcs_backlight.h | 0
.../drm/i915/{ => display}/intel_dsi_vbt.c | 0
.../gpu/drm/i915/{ => display}/intel_dvo.c | 0
.../gpu/drm/i915/{ => display}/intel_dvo.h | 0
.../drm/i915/{ => display}/intel_dvo_dev.h | 0
.../gpu/drm/i915/{ => display}/intel_gmbus.c | 0
.../gpu/drm/i915/{ => display}/intel_gmbus.h | 0
.../gpu/drm/i915/{ => display}/intel_hdmi.c | 0
.../gpu/drm/i915/{ => display}/intel_hdmi.h | 0
.../gpu/drm/i915/{ => display}/intel_lspcon.c | 0
.../gpu/drm/i915/{ => display}/intel_lspcon.h | 0
.../gpu/drm/i915/{ => display}/intel_lvds.c | 0
.../gpu/drm/i915/{ => display}/intel_lvds.h | 0
.../gpu/drm/i915/{ => display}/intel_panel.c | 0
.../gpu/drm/i915/{ => display}/intel_panel.h | 0
.../gpu/drm/i915/{ => display}/intel_sdvo.c | 0
.../gpu/drm/i915/{ => display}/intel_sdvo.h | 0
.../drm/i915/{ => display}/intel_sdvo_regs.h | 0
drivers/gpu/drm/i915/{ => display}/intel_tv.c | 0
drivers/gpu/drm/i915/{ => display}/intel_tv.h | 0
.../gpu/drm/i915/{ => display}/intel_vdsc.c | 0
.../gpu/drm/i915/{ => display}/intel_vdsc.h | 0
drivers/gpu/drm/i915/{ => display}/vlv_dsi.c | 0
.../gpu/drm/i915/{ => display}/vlv_dsi_pll.c | 0
drivers/gpu/drm/i915/i915_debugfs.c | 5 +-
drivers/gpu/drm/i915/i915_drv.c | 5 +-
drivers/gpu/drm/i915/i915_suspend.c | 3 +-
drivers/gpu/drm/i915/intel_bios.c | 3 +-
drivers/gpu/drm/i915/intel_connector.c | 3 +-
drivers/gpu/drm/i915/intel_display.c | 23 ++++----
drivers/gpu/drm/i915/intel_display_power.c | 5 +-
drivers/gpu/drm/i915/intel_dpio_phy.c | 3 +-
drivers/gpu/drm/i915/intel_frontbuffer.c | 3 +-
drivers/gpu/drm/i915/intel_opregion.c | 3 +-
drivers/gpu/drm/i915/intel_psr.c | 3 +-
61 files changed, 82 insertions(+), 70 deletions(-)
create mode 100644 drivers/gpu/drm/i915/display/Makefile
create mode 100644 drivers/gpu/drm/i915/display/Makefile.header-test
rename drivers/gpu/drm/i915/{ => display}/dvo_ch7017.c (100%)
rename drivers/gpu/drm/i915/{ => display}/dvo_ch7xxx.c (100%)
rename drivers/gpu/drm/i915/{ => display}/dvo_ivch.c (100%)
rename drivers/gpu/drm/i915/{ => display}/dvo_ns2501.c (100%)
rename drivers/gpu/drm/i915/{ => display}/dvo_sil164.c (100%)
rename drivers/gpu/drm/i915/{ => display}/dvo_tfp410.c (100%)
rename drivers/gpu/drm/i915/{ => display}/icl_dsi.c (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_crt.c (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_crt.h (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_ddi.c (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_ddi.h (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_dp.c (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_dp.h (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_dp_aux_backlight.c (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_dp_aux_backlight.h (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_dp_link_training.c (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_dp_link_training.h (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_dp_mst.c (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_dp_mst.h (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_dsi.c (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_dsi.h (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_dsi_dcs_backlight.c (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_dsi_dcs_backlight.h (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_dsi_vbt.c (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_dvo.c (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_dvo.h (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_dvo_dev.h (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_gmbus.c (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_gmbus.h (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_hdmi.c (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_hdmi.h (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_lspcon.c (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_lspcon.h (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_lvds.c (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_lvds.h (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_panel.c (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_panel.h (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_sdvo.c (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_sdvo.h (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_sdvo_regs.h (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_tv.c (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_tv.h (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_vdsc.c (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_vdsc.h (100%)
rename drivers/gpu/drm/i915/{ => display}/vlv_dsi.c (100%)
rename drivers/gpu/drm/i915/{ => display}/vlv_dsi_pll.c (100%)
diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
index c0a7b2994077..649f286887b7 100644
--- a/drivers/gpu/drm/i915/Makefile
+++ b/drivers/gpu/drm/i915/Makefile
@@ -176,33 +176,35 @@ i915-$(CONFIG_ACPI) += intel_acpi.o intel_opregion.o
i915-$(CONFIG_DRM_FBDEV_EMULATION) += intel_fbdev.o
# modesetting output/encoder code
-i915-y += dvo_ch7017.o \
- dvo_ch7xxx.o \
- dvo_ivch.o \
- dvo_ns2501.o \
- dvo_sil164.o \
- dvo_tfp410.o \
- icl_dsi.o \
- intel_crt.o \
- intel_ddi.o \
- intel_dp_aux_backlight.o \
- intel_dp_link_training.o \
- intel_dp_mst.o \
- intel_dp.o \
- intel_dsi.o \
- intel_dsi_dcs_backlight.o \
- intel_dsi_vbt.o \
- intel_dvo.o \
- intel_gmbus.o \
- intel_hdmi.o \
- intel_lspcon.o \
- intel_lvds.o \
- intel_panel.o \
- intel_sdvo.o \
- intel_tv.o \
- vlv_dsi.o \
- vlv_dsi_pll.o \
- intel_vdsc.o
+obj-y += display/
+i915-y += \
+ display/dvo_ch7017.o \
+ display/dvo_ch7xxx.o \
+ display/dvo_ivch.o \
+ display/dvo_ns2501.o \
+ display/dvo_sil164.o \
+ display/dvo_tfp410.o \
+ display/icl_dsi.o \
+ display/intel_crt.o \
+ display/intel_ddi.o \
+ display/intel_dp.o \
+ display/intel_dp_aux_backlight.o \
+ display/intel_dp_link_training.o \
+ display/intel_dp_mst.o \
+ display/intel_dsi.o \
+ display/intel_dsi_dcs_backlight.o \
+ display/intel_dsi_vbt.o \
+ display/intel_dvo.o \
+ display/intel_gmbus.o \
+ display/intel_hdmi.o \
+ display/intel_lspcon.o \
+ display/intel_lvds.o \
+ display/intel_panel.o \
+ display/intel_sdvo.o \
+ display/intel_tv.o \
+ display/intel_vdsc.o \
+ display/vlv_dsi.o \
+ display/vlv_dsi_pll.o
# Post-mortem debug and GPU hang state capture
i915-$(CONFIG_DRM_I915_CAPTURE_ERROR) += i915_gpu_error.o
--git a/drivers/gpu/drm/i915/Makefile.header-test b/drivers/gpu/drm/i915/Makefile.header-test
index c04297ce57b4..5a04858c9b7b 100644
--- a/drivers/gpu/drm/i915/Makefile.header-test
+++ b/drivers/gpu/drm/i915/Makefile.header-test
@@ -22,46 +22,27 @@ header_test := \
intel_color.h \
intel_combo_phy.h \
intel_connector.h \
- intel_crt.h \
intel_csr.h \
- intel_ddi.h \
intel_display_power.h \
- intel_dp.h \
- intel_dp_aux_backlight.h \
- intel_dp_link_training.h \
- intel_dp_mst.h \
intel_dpio_phy.h \
intel_dpll_mgr.h \
intel_drv.h \
- intel_dsi.h \
- intel_dsi_dcs_backlight.h \
- intel_dvo.h \
- intel_dvo_dev.h \
intel_fbc.h \
intel_fbdev.h \
intel_fifo_underrun.h \
intel_frontbuffer.h \
- intel_gmbus.h \
intel_hdcp.h \
- intel_hdmi.h \
intel_hotplug.h \
intel_lpe_audio.h \
- intel_lspcon.h \
- intel_lvds.h \
intel_overlay.h \
- intel_panel.h \
intel_pipe_crc.h \
intel_pm.h \
intel_psr.h \
intel_quirks.h \
intel_runtime_pm.h \
- intel_sdvo.h \
- intel_sdvo_regs.h \
intel_sideband.h \
intel_sprite.h \
- intel_tv.h \
intel_uncore.h \
- intel_vdsc.h \
intel_wakeref.h
quiet_cmd_header_test = HDRTEST $@
diff --git a/drivers/gpu/drm/i915/display/Makefile b/drivers/gpu/drm/i915/display/Makefile
new file mode 100644
index 000000000000..1c75b5c9790c
--- /dev/null
+++ b/drivers/gpu/drm/i915/display/Makefile
@@ -0,0 +1,2 @@
+# Extra header tests
+include $(src)/Makefile.header-test
--git a/drivers/gpu/drm/i915/display/Makefile.header-test b/drivers/gpu/drm/i915/display/Makefile.header-test
new file mode 100644
index 000000000000..61e06cbb4b32
--- /dev/null
+++ b/drivers/gpu/drm/i915/display/Makefile.header-test
@@ -0,0 +1,16 @@
+# 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)))
diff --git a/drivers/gpu/drm/i915/dvo_ch7017.c b/drivers/gpu/drm/i915/display/dvo_ch7017.c
similarity index 100%
rename from drivers/gpu/drm/i915/dvo_ch7017.c
rename to drivers/gpu/drm/i915/display/dvo_ch7017.c
diff --git a/drivers/gpu/drm/i915/dvo_ch7xxx.c b/drivers/gpu/drm/i915/display/dvo_ch7xxx.c
similarity index 100%
rename from drivers/gpu/drm/i915/dvo_ch7xxx.c
rename to drivers/gpu/drm/i915/display/dvo_ch7xxx.c
diff --git a/drivers/gpu/drm/i915/dvo_ivch.c b/drivers/gpu/drm/i915/display/dvo_ivch.c
similarity index 100%
rename from drivers/gpu/drm/i915/dvo_ivch.c
rename to drivers/gpu/drm/i915/display/dvo_ivch.c
diff --git a/drivers/gpu/drm/i915/dvo_ns2501.c b/drivers/gpu/drm/i915/display/dvo_ns2501.c
similarity index 100%
rename from drivers/gpu/drm/i915/dvo_ns2501.c
rename to drivers/gpu/drm/i915/display/dvo_ns2501.c
diff --git a/drivers/gpu/drm/i915/dvo_sil164.c b/drivers/gpu/drm/i915/display/dvo_sil164.c
similarity index 100%
rename from drivers/gpu/drm/i915/dvo_sil164.c
rename to drivers/gpu/drm/i915/display/dvo_sil164.c
diff --git a/drivers/gpu/drm/i915/dvo_tfp410.c b/drivers/gpu/drm/i915/display/dvo_tfp410.c
similarity index 100%
rename from drivers/gpu/drm/i915/dvo_tfp410.c
rename to drivers/gpu/drm/i915/display/dvo_tfp410.c
diff --git a/drivers/gpu/drm/i915/icl_dsi.c b/drivers/gpu/drm/i915/display/icl_dsi.c
similarity index 100%
rename from drivers/gpu/drm/i915/icl_dsi.c
rename to drivers/gpu/drm/i915/display/icl_dsi.c
diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/display/intel_crt.c
similarity index 100%
rename from drivers/gpu/drm/i915/intel_crt.c
rename to drivers/gpu/drm/i915/display/intel_crt.c
diff --git a/drivers/gpu/drm/i915/intel_crt.h b/drivers/gpu/drm/i915/display/intel_crt.h
similarity index 100%
rename from drivers/gpu/drm/i915/intel_crt.h
rename to drivers/gpu/drm/i915/display/intel_crt.h
diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
similarity index 100%
rename from drivers/gpu/drm/i915/intel_ddi.c
rename to drivers/gpu/drm/i915/display/intel_ddi.c
diff --git a/drivers/gpu/drm/i915/intel_ddi.h b/drivers/gpu/drm/i915/display/intel_ddi.h
similarity index 100%
rename from drivers/gpu/drm/i915/intel_ddi.h
rename to drivers/gpu/drm/i915/display/intel_ddi.h
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
similarity index 100%
rename from drivers/gpu/drm/i915/intel_dp.c
rename to drivers/gpu/drm/i915/display/intel_dp.c
diff --git a/drivers/gpu/drm/i915/intel_dp.h b/drivers/gpu/drm/i915/display/intel_dp.h
similarity index 100%
rename from drivers/gpu/drm/i915/intel_dp.h
rename to drivers/gpu/drm/i915/display/intel_dp.h
diff --git a/drivers/gpu/drm/i915/intel_dp_aux_backlight.c b/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c
similarity index 100%
rename from drivers/gpu/drm/i915/intel_dp_aux_backlight.c
rename to drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c
diff --git a/drivers/gpu/drm/i915/intel_dp_aux_backlight.h b/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.h
similarity index 100%
rename from drivers/gpu/drm/i915/intel_dp_aux_backlight.h
rename to drivers/gpu/drm/i915/display/intel_dp_aux_backlight.h
diff --git a/drivers/gpu/drm/i915/intel_dp_link_training.c b/drivers/gpu/drm/i915/display/intel_dp_link_training.c
similarity index 100%
rename from drivers/gpu/drm/i915/intel_dp_link_training.c
rename to drivers/gpu/drm/i915/display/intel_dp_link_training.c
diff --git a/drivers/gpu/drm/i915/intel_dp_link_training.h b/drivers/gpu/drm/i915/display/intel_dp_link_training.h
similarity index 100%
rename from drivers/gpu/drm/i915/intel_dp_link_training.h
rename to drivers/gpu/drm/i915/display/intel_dp_link_training.h
diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c
similarity index 100%
rename from drivers/gpu/drm/i915/intel_dp_mst.c
rename to drivers/gpu/drm/i915/display/intel_dp_mst.c
diff --git a/drivers/gpu/drm/i915/intel_dp_mst.h b/drivers/gpu/drm/i915/display/intel_dp_mst.h
similarity index 100%
rename from drivers/gpu/drm/i915/intel_dp_mst.h
rename to drivers/gpu/drm/i915/display/intel_dp_mst.h
diff --git a/drivers/gpu/drm/i915/intel_dsi.c b/drivers/gpu/drm/i915/display/intel_dsi.c
similarity index 100%
rename from drivers/gpu/drm/i915/intel_dsi.c
rename to drivers/gpu/drm/i915/display/intel_dsi.c
diff --git a/drivers/gpu/drm/i915/intel_dsi.h b/drivers/gpu/drm/i915/display/intel_dsi.h
similarity index 100%
rename from drivers/gpu/drm/i915/intel_dsi.h
rename to drivers/gpu/drm/i915/display/intel_dsi.h
diff --git a/drivers/gpu/drm/i915/intel_dsi_dcs_backlight.c b/drivers/gpu/drm/i915/display/intel_dsi_dcs_backlight.c
similarity index 100%
rename from drivers/gpu/drm/i915/intel_dsi_dcs_backlight.c
rename to drivers/gpu/drm/i915/display/intel_dsi_dcs_backlight.c
diff --git a/drivers/gpu/drm/i915/intel_dsi_dcs_backlight.h b/drivers/gpu/drm/i915/display/intel_dsi_dcs_backlight.h
similarity index 100%
rename from drivers/gpu/drm/i915/intel_dsi_dcs_backlight.h
rename to drivers/gpu/drm/i915/display/intel_dsi_dcs_backlight.h
diff --git a/drivers/gpu/drm/i915/intel_dsi_vbt.c b/drivers/gpu/drm/i915/display/intel_dsi_vbt.c
similarity index 100%
rename from drivers/gpu/drm/i915/intel_dsi_vbt.c
rename to drivers/gpu/drm/i915/display/intel_dsi_vbt.c
diff --git a/drivers/gpu/drm/i915/intel_dvo.c b/drivers/gpu/drm/i915/display/intel_dvo.c
similarity index 100%
rename from drivers/gpu/drm/i915/intel_dvo.c
rename to drivers/gpu/drm/i915/display/intel_dvo.c
diff --git a/drivers/gpu/drm/i915/intel_dvo.h b/drivers/gpu/drm/i915/display/intel_dvo.h
similarity index 100%
rename from drivers/gpu/drm/i915/intel_dvo.h
rename to drivers/gpu/drm/i915/display/intel_dvo.h
diff --git a/drivers/gpu/drm/i915/intel_dvo_dev.h b/drivers/gpu/drm/i915/display/intel_dvo_dev.h
similarity index 100%
rename from drivers/gpu/drm/i915/intel_dvo_dev.h
rename to drivers/gpu/drm/i915/display/intel_dvo_dev.h
diff --git a/drivers/gpu/drm/i915/intel_gmbus.c b/drivers/gpu/drm/i915/display/intel_gmbus.c
similarity index 100%
rename from drivers/gpu/drm/i915/intel_gmbus.c
rename to drivers/gpu/drm/i915/display/intel_gmbus.c
diff --git a/drivers/gpu/drm/i915/intel_gmbus.h b/drivers/gpu/drm/i915/display/intel_gmbus.h
similarity index 100%
rename from drivers/gpu/drm/i915/intel_gmbus.h
rename to drivers/gpu/drm/i915/display/intel_gmbus.h
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c
similarity index 100%
rename from drivers/gpu/drm/i915/intel_hdmi.c
rename to drivers/gpu/drm/i915/display/intel_hdmi.c
diff --git a/drivers/gpu/drm/i915/intel_hdmi.h b/drivers/gpu/drm/i915/display/intel_hdmi.h
similarity index 100%
rename from drivers/gpu/drm/i915/intel_hdmi.h
rename to drivers/gpu/drm/i915/display/intel_hdmi.h
diff --git a/drivers/gpu/drm/i915/intel_lspcon.c b/drivers/gpu/drm/i915/display/intel_lspcon.c
similarity index 100%
rename from drivers/gpu/drm/i915/intel_lspcon.c
rename to drivers/gpu/drm/i915/display/intel_lspcon.c
diff --git a/drivers/gpu/drm/i915/intel_lspcon.h b/drivers/gpu/drm/i915/display/intel_lspcon.h
similarity index 100%
rename from drivers/gpu/drm/i915/intel_lspcon.h
rename to drivers/gpu/drm/i915/display/intel_lspcon.h
diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/display/intel_lvds.c
similarity index 100%
rename from drivers/gpu/drm/i915/intel_lvds.c
rename to drivers/gpu/drm/i915/display/intel_lvds.c
diff --git a/drivers/gpu/drm/i915/intel_lvds.h b/drivers/gpu/drm/i915/display/intel_lvds.h
similarity index 100%
rename from drivers/gpu/drm/i915/intel_lvds.h
rename to drivers/gpu/drm/i915/display/intel_lvds.h
diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/display/intel_panel.c
similarity index 100%
rename from drivers/gpu/drm/i915/intel_panel.c
rename to drivers/gpu/drm/i915/display/intel_panel.c
diff --git a/drivers/gpu/drm/i915/intel_panel.h b/drivers/gpu/drm/i915/display/intel_panel.h
similarity index 100%
rename from drivers/gpu/drm/i915/intel_panel.h
rename to drivers/gpu/drm/i915/display/intel_panel.h
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/display/intel_sdvo.c
similarity index 100%
rename from drivers/gpu/drm/i915/intel_sdvo.c
rename to drivers/gpu/drm/i915/display/intel_sdvo.c
diff --git a/drivers/gpu/drm/i915/intel_sdvo.h b/drivers/gpu/drm/i915/display/intel_sdvo.h
similarity index 100%
rename from drivers/gpu/drm/i915/intel_sdvo.h
rename to drivers/gpu/drm/i915/display/intel_sdvo.h
diff --git a/drivers/gpu/drm/i915/intel_sdvo_regs.h b/drivers/gpu/drm/i915/display/intel_sdvo_regs.h
similarity index 100%
rename from drivers/gpu/drm/i915/intel_sdvo_regs.h
rename to drivers/gpu/drm/i915/display/intel_sdvo_regs.h
diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/display/intel_tv.c
similarity index 100%
rename from drivers/gpu/drm/i915/intel_tv.c
rename to drivers/gpu/drm/i915/display/intel_tv.c
diff --git a/drivers/gpu/drm/i915/intel_tv.h b/drivers/gpu/drm/i915/display/intel_tv.h
similarity index 100%
rename from drivers/gpu/drm/i915/intel_tv.h
rename to drivers/gpu/drm/i915/display/intel_tv.h
diff --git a/drivers/gpu/drm/i915/intel_vdsc.c b/drivers/gpu/drm/i915/display/intel_vdsc.c
similarity index 100%
rename from drivers/gpu/drm/i915/intel_vdsc.c
rename to drivers/gpu/drm/i915/display/intel_vdsc.c
diff --git a/drivers/gpu/drm/i915/intel_vdsc.h b/drivers/gpu/drm/i915/display/intel_vdsc.h
similarity index 100%
rename from drivers/gpu/drm/i915/intel_vdsc.h
rename to drivers/gpu/drm/i915/display/intel_vdsc.h
diff --git a/drivers/gpu/drm/i915/vlv_dsi.c b/drivers/gpu/drm/i915/display/vlv_dsi.c
similarity index 100%
rename from drivers/gpu/drm/i915/vlv_dsi.c
rename to drivers/gpu/drm/i915/display/vlv_dsi.c
diff --git a/drivers/gpu/drm/i915/vlv_dsi_pll.c b/drivers/gpu/drm/i915/display/vlv_dsi_pll.c
similarity index 100%
rename from drivers/gpu/drm/i915/vlv_dsi_pll.c
rename to drivers/gpu/drm/i915/display/vlv_dsi_pll.c
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 026fb46020f6..b3425c7dc6bb 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -32,18 +32,19 @@
#include <drm/drm_debugfs.h>
#include <drm/drm_fourcc.h>
+#include "display/intel_dp.h"
+#include "display/intel_hdmi.h"
+
#include "gem/i915_gem_context.h"
#include "gt/intel_reset.h"
#include "i915_debugfs.h"
#include "i915_irq.h"
#include "intel_csr.h"
-#include "intel_dp.h"
#include "intel_drv.h"
#include "intel_fbc.h"
#include "intel_guc_submission.h"
#include "intel_hdcp.h"
-#include "intel_hdmi.h"
#include "intel_pm.h"
#include "intel_psr.h"
#include "intel_sideband.h"
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 81ff2c78fd55..9b72387c4101 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -47,6 +47,9 @@
#include <drm/drm_probe_helper.h>
#include <drm/i915_drm.h>
+#include "display/intel_dp.h"
+#include "display/intel_gmbus.h"
+
#include "gem/i915_gem_context.h"
#include "gem/i915_gem_ioctls.h"
#include "gt/intel_gt_pm.h"
@@ -65,10 +68,8 @@
#include "intel_bw.h"
#include "intel_cdclk.h"
#include "intel_csr.h"
-#include "intel_dp.h"
#include "intel_drv.h"
#include "intel_fbdev.h"
-#include "intel_gmbus.h"
#include "intel_hotplug.h"
#include "intel_overlay.h"
#include "intel_pipe_crc.h"
diff --git a/drivers/gpu/drm/i915/i915_suspend.c b/drivers/gpu/drm/i915/i915_suspend.c
index 581201bcb81a..1e38a60a8ec7 100644
--- a/drivers/gpu/drm/i915/i915_suspend.c
+++ b/drivers/gpu/drm/i915/i915_suspend.c
@@ -26,10 +26,11 @@
#include <drm/i915_drm.h>
+#include "display/intel_gmbus.h"
+
#include "i915_reg.h"
#include "intel_drv.h"
#include "intel_fbc.h"
-#include "intel_gmbus.h"
static void i915_save_display(struct drm_i915_private *dev_priv)
{
diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c
index 1c037dfa83f5..270719fabbc5 100644
--- a/drivers/gpu/drm/i915/intel_bios.c
+++ b/drivers/gpu/drm/i915/intel_bios.c
@@ -28,8 +28,9 @@
#include <drm/drm_dp_helper.h>
#include <drm/i915_drm.h>
+#include "display/intel_gmbus.h"
+
#include "i915_drv.h"
-#include "intel_gmbus.h"
#define _INTEL_BIOS_PRIVATE
#include "intel_vbt_defs.h"
diff --git a/drivers/gpu/drm/i915/intel_connector.c b/drivers/gpu/drm/i915/intel_connector.c
index 073b6c3ab7cc..41310f8e5a2a 100644
--- a/drivers/gpu/drm/i915/intel_connector.c
+++ b/drivers/gpu/drm/i915/intel_connector.c
@@ -29,11 +29,12 @@
#include <drm/drm_atomic_helper.h>
#include <drm/drm_edid.h>
+#include "display/intel_panel.h"
+
#include "i915_drv.h"
#include "intel_connector.h"
#include "intel_drv.h"
#include "intel_hdcp.h"
-#include "intel_panel.h"
int intel_connector_init(struct intel_connector *connector)
{
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index e681ed99cdf2..7155f2409d25 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -44,6 +44,18 @@
#include <drm/drm_rect.h>
#include <drm/i915_drm.h>
+#include "display/intel_crt.h"
+#include "display/intel_ddi.h"
+#include "display/intel_dp.h"
+#include "display/intel_dsi.h"
+#include "display/intel_dvo.h"
+#include "display/intel_gmbus.h"
+#include "display/intel_hdmi.h"
+#include "display/intel_lvds.h"
+#include "display/intel_sdvo.h"
+#include "display/intel_tv.h"
+#include "display/intel_vdsc.h"
+
#include "i915_drv.h"
#include "i915_trace.h"
#include "intel_acpi.h"
@@ -52,31 +64,20 @@
#include "intel_bw.h"
#include "intel_color.h"
#include "intel_cdclk.h"
-#include "intel_crt.h"
-#include "intel_ddi.h"
-#include "intel_dp.h"
#include "intel_drv.h"
-#include "intel_dsi.h"
-#include "intel_dvo.h"
#include "intel_fbc.h"
#include "intel_fbdev.h"
#include "intel_fifo_underrun.h"
#include "intel_frontbuffer.h"
-#include "intel_gmbus.h"
#include "intel_hdcp.h"
-#include "intel_hdmi.h"
#include "intel_hotplug.h"
-#include "intel_lvds.h"
#include "intel_overlay.h"
#include "intel_pipe_crc.h"
#include "intel_pm.h"
#include "intel_psr.h"
#include "intel_quirks.h"
-#include "intel_sdvo.h"
#include "intel_sideband.h"
#include "intel_sprite.h"
-#include "intel_tv.h"
-#include "intel_vdsc.h"
/* Primary plane formats for gen <= 3 */
static const u32 i8xx_primary_formats[] = {
diff --git a/drivers/gpu/drm/i915/intel_display_power.c b/drivers/gpu/drm/i915/intel_display_power.c
index bb9ef1cea5db..5d00661880a1 100644
--- a/drivers/gpu/drm/i915/intel_display_power.c
+++ b/drivers/gpu/drm/i915/intel_display_power.c
@@ -5,13 +5,14 @@
#include <linux/vgaarb.h>
+#include "display/intel_crt.h"
+#include "display/intel_dp.h"
+
#include "i915_drv.h"
#include "i915_irq.h"
#include "intel_cdclk.h"
#include "intel_combo_phy.h"
-#include "intel_crt.h"
#include "intel_csr.h"
-#include "intel_dp.h"
#include "intel_dpio_phy.h"
#include "intel_drv.h"
#include "intel_hotplug.h"
diff --git a/drivers/gpu/drm/i915/intel_dpio_phy.c b/drivers/gpu/drm/i915/intel_dpio_phy.c
index bdbe41759827..7ccf7f3974db 100644
--- a/drivers/gpu/drm/i915/intel_dpio_phy.c
+++ b/drivers/gpu/drm/i915/intel_dpio_phy.c
@@ -21,7 +21,8 @@
* DEALINGS IN THE SOFTWARE.
*/
-#include "intel_dp.h"
+#include "display/intel_dp.h"
+
#include "intel_dpio_phy.h"
#include "intel_drv.h"
#include "intel_sideband.h"
diff --git a/drivers/gpu/drm/i915/intel_frontbuffer.c b/drivers/gpu/drm/i915/intel_frontbuffer.c
index d6036b9ad16a..44273c10cea5 100644
--- a/drivers/gpu/drm/i915/intel_frontbuffer.c
+++ b/drivers/gpu/drm/i915/intel_frontbuffer.c
@@ -55,8 +55,9 @@
* cancelled as soon as busyness is detected.
*/
+#include "display/intel_dp.h"
+
#include "i915_drv.h"
-#include "intel_dp.h"
#include "intel_drv.h"
#include "intel_fbc.h"
#include "intel_frontbuffer.h"
diff --git a/drivers/gpu/drm/i915/intel_opregion.c b/drivers/gpu/drm/i915/intel_opregion.c
index 8fa1159d097f..824881271351 100644
--- a/drivers/gpu/drm/i915/intel_opregion.c
+++ b/drivers/gpu/drm/i915/intel_opregion.c
@@ -32,10 +32,11 @@
#include <drm/i915_drm.h>
+#include "display/intel_panel.h"
+
#include "i915_drv.h"
#include "intel_drv.h"
#include "intel_opregion.h"
-#include "intel_panel.h"
#define OPREGION_HEADER_OFFSET 0
#define OPREGION_ACPI_OFFSET 0x100
diff --git a/drivers/gpu/drm/i915/intel_psr.c b/drivers/gpu/drm/i915/intel_psr.c
index 01ca502099df..69709df4a648 100644
--- a/drivers/gpu/drm/i915/intel_psr.c
+++ b/drivers/gpu/drm/i915/intel_psr.c
@@ -23,8 +23,9 @@
#include <drm/drm_atomic_helper.h>
+#include "display/intel_dp.h"
+
#include "i915_drv.h"
-#include "intel_dp.h"
#include "intel_drv.h"
#include "intel_psr.h"
#include "intel_sprite.h"
--
2.20.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH v2 3/3] drm/i915: move modesetting core code under display/
2019-06-13 8:44 [PATCH v2 1/3] drm/i915: make intel_sdvo_regs.h self-contained Jani Nikula
2019-06-13 8:44 ` [PATCH v2 2/3] drm/i915: move modesetting output/encoder code under display/ Jani Nikula
@ 2019-06-13 8:44 ` Jani Nikula
2019-06-13 14:12 ` Maarten Lankhorst
2019-06-13 9:16 ` [PATCH v2 1/3] drm/i915: make intel_sdvo_regs.h self-contained Chris Wilson
` (8 subsequent siblings)
10 siblings, 1 reply; 17+ messages in thread
From: Jani Nikula @ 2019-06-13 8:44 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula
Now that we have a new subdirectory for display code, continue by moving
modesetting core code.
display/intel_frontbuffer.h sticks out like a sore thumb, otherwise this
is, again, a surprisingly clean operation.
v2:
- don't move intel_sideband.[ch] (Ville)
- use tabs for Makefile file lists and sort them
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/Makefile | 66 ++++++++++---------
| 24 -------
| 2 +-
.../gpu/drm/i915/{ => display}/intel_acpi.c | 0
.../gpu/drm/i915/{ => display}/intel_acpi.h | 0
.../gpu/drm/i915/{ => display}/intel_atomic.c | 0
.../gpu/drm/i915/{ => display}/intel_atomic.h | 0
.../i915/{ => display}/intel_atomic_plane.c | 0
.../i915/{ => display}/intel_atomic_plane.h | 0
.../gpu/drm/i915/{ => display}/intel_audio.c | 0
.../gpu/drm/i915/{ => display}/intel_audio.h | 0
.../gpu/drm/i915/{ => display}/intel_bios.c | 0
.../gpu/drm/i915/{ => display}/intel_bios.h | 0
drivers/gpu/drm/i915/{ => display}/intel_bw.c | 0
drivers/gpu/drm/i915/{ => display}/intel_bw.h | 0
.../gpu/drm/i915/{ => display}/intel_cdclk.c | 0
.../gpu/drm/i915/{ => display}/intel_cdclk.h | 0
.../gpu/drm/i915/{ => display}/intel_color.c | 0
.../gpu/drm/i915/{ => display}/intel_color.h | 0
.../drm/i915/{ => display}/intel_combo_phy.c | 0
.../drm/i915/{ => display}/intel_combo_phy.h | 0
.../drm/i915/{ => display}/intel_connector.c | 0
.../drm/i915/{ => display}/intel_connector.h | 0
.../drm/i915/{ => display}/intel_display.c | 0
.../drm/i915/{ => display}/intel_display.h | 0
.../i915/{ => display}/intel_display_power.c | 0
.../i915/{ => display}/intel_display_power.h | 0
.../drm/i915/{ => display}/intel_dpio_phy.c | 0
.../drm/i915/{ => display}/intel_dpio_phy.h | 0
.../drm/i915/{ => display}/intel_dpll_mgr.c | 0
.../drm/i915/{ => display}/intel_dpll_mgr.h | 0
.../gpu/drm/i915/{ => display}/intel_fbc.c | 0
.../gpu/drm/i915/{ => display}/intel_fbc.h | 0
.../gpu/drm/i915/{ => display}/intel_fbdev.c | 0
.../gpu/drm/i915/{ => display}/intel_fbdev.h | 0
.../i915/{ => display}/intel_fifo_underrun.c | 0
.../i915/{ => display}/intel_fifo_underrun.h | 0
.../i915/{ => display}/intel_frontbuffer.c | 0
.../i915/{ => display}/intel_frontbuffer.h | 0
.../gpu/drm/i915/{ => display}/intel_hdcp.c | 0
.../gpu/drm/i915/{ => display}/intel_hdcp.h | 0
.../drm/i915/{ => display}/intel_hotplug.c | 0
.../drm/i915/{ => display}/intel_hotplug.h | 0
.../drm/i915/{ => display}/intel_lpe_audio.c | 0
.../drm/i915/{ => display}/intel_lpe_audio.h | 0
.../drm/i915/{ => display}/intel_opregion.c | 0
.../drm/i915/{ => display}/intel_opregion.h | 0
.../drm/i915/{ => display}/intel_overlay.c | 0
.../drm/i915/{ => display}/intel_overlay.h | 0
.../drm/i915/{ => display}/intel_pipe_crc.c | 0
.../drm/i915/{ => display}/intel_pipe_crc.h | 0
.../gpu/drm/i915/{ => display}/intel_psr.c | 0
.../gpu/drm/i915/{ => display}/intel_psr.h | 0
.../gpu/drm/i915/{ => display}/intel_quirks.c | 0
.../gpu/drm/i915/{ => display}/intel_quirks.h | 0
.../gpu/drm/i915/{ => display}/intel_sprite.c | 0
.../gpu/drm/i915/{ => display}/intel_sprite.h | 0
.../drm/i915/{ => display}/intel_vbt_defs.h | 0
drivers/gpu/drm/i915/gem/i915_gem_clflush.c | 3 +-
drivers/gpu/drm/i915/gem/i915_gem_domain.c | 3 +-
.../gpu/drm/i915/gem/i915_gem_execbuffer.c | 3 +-
drivers/gpu/drm/i915/gem/i915_gem_object.c | 3 +-
drivers/gpu/drm/i915/gt/intel_reset.c | 3 +-
drivers/gpu/drm/i915/gvt/opregion.c | 2 +-
drivers/gpu/drm/i915/i915_debugfs.c | 6 +-
drivers/gpu/drm/i915/i915_drv.c | 18 ++---
drivers/gpu/drm/i915/i915_drv.h | 13 ++--
drivers/gpu/drm/i915/i915_gem.c | 5 +-
drivers/gpu/drm/i915/i915_gem_gtt.c | 3 +-
drivers/gpu/drm/i915/i915_gpu_error.c | 5 +-
drivers/gpu/drm/i915/i915_irq.c | 9 +--
drivers/gpu/drm/i915/i915_pci.c | 3 +-
drivers/gpu/drm/i915/i915_suspend.c | 2 +-
drivers/gpu/drm/i915/i915_vma.c | 10 +--
drivers/gpu/drm/i915/intel_device_info.h | 4 +-
drivers/gpu/drm/i915/intel_pm.c | 7 +-
drivers/gpu/drm/i915/intel_runtime_pm.h | 3 +-
77 files changed, 94 insertions(+), 103 deletions(-)
rename drivers/gpu/drm/i915/{ => display}/intel_acpi.c (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_acpi.h (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_atomic.c (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_atomic.h (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_atomic_plane.c (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_atomic_plane.h (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_audio.c (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_audio.h (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_bios.c (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_bios.h (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_bw.c (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_bw.h (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_cdclk.c (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_cdclk.h (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_color.c (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_color.h (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_combo_phy.c (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_combo_phy.h (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_connector.c (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_connector.h (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_display.c (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_display.h (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_display_power.c (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_display_power.h (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_dpio_phy.c (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_dpio_phy.h (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_dpll_mgr.c (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_dpll_mgr.h (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_fbc.c (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_fbc.h (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_fbdev.c (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_fbdev.h (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_fifo_underrun.c (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_fifo_underrun.h (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_frontbuffer.c (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_frontbuffer.h (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_hdcp.c (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_hdcp.h (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_hotplug.c (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_hotplug.h (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_lpe_audio.c (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_lpe_audio.h (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_opregion.c (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_opregion.h (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_overlay.c (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_overlay.h (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_pipe_crc.c (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_pipe_crc.h (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_psr.c (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_psr.h (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_quirks.c (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_quirks.h (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_sprite.c (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_sprite.h (100%)
rename drivers/gpu/drm/i915/{ => display}/intel_vbt_defs.h (100%)
diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
index 649f286887b7..91355c2ea8a5 100644
--- a/drivers/gpu/drm/i915/Makefile
+++ b/drivers/gpu/drm/i915/Makefile
@@ -51,8 +51,9 @@ i915-y += i915_drv.o \
intel_device_info.o \
intel_pm.o \
intel_runtime_pm.o \
- intel_wakeref.o \
- intel_uncore.o
+ intel_sideband.o \
+ intel_uncore.o \
+ intel_wakeref.o
# core library code
i915-y += \
@@ -63,7 +64,7 @@ i915-y += \
i915_user_extensions.o
i915-$(CONFIG_COMPAT) += i915_ioc32.o
-i915-$(CONFIG_DEBUG_FS) += i915_debugfs.o intel_pipe_crc.o
+i915-$(CONFIG_DEBUG_FS) += i915_debugfs.o display/intel_pipe_crc.o
i915-$(CONFIG_PERF_EVENTS) += i915_pmu.o
# "Graphics Technology" (aka we talk to the gpu)
@@ -149,34 +150,38 @@ i915-y += intel_renderstate_gen6.o \
intel_renderstate_gen9.o
# modesetting core code
-i915-y += intel_audio.o \
- intel_atomic.o \
- intel_atomic_plane.o \
- intel_bios.o \
- intel_bw.o \
- intel_cdclk.o \
- intel_color.o \
- intel_combo_phy.o \
- intel_connector.o \
- intel_display.o \
- intel_display_power.o \
- intel_dpio_phy.o \
- intel_dpll_mgr.o \
- intel_fbc.o \
- intel_fifo_underrun.o \
- intel_frontbuffer.o \
- intel_hdcp.o \
- intel_hotplug.o \
- intel_overlay.o \
- intel_psr.o \
- intel_quirks.o \
- intel_sideband.o \
- intel_sprite.o
-i915-$(CONFIG_ACPI) += intel_acpi.o intel_opregion.o
-i915-$(CONFIG_DRM_FBDEV_EMULATION) += intel_fbdev.o
+obj-y += display/
+i915-y += \
+ display/intel_atomic.o \
+ display/intel_atomic_plane.o \
+ display/intel_audio.o \
+ display/intel_bios.o \
+ display/intel_bw.o \
+ display/intel_cdclk.o \
+ display/intel_color.o \
+ display/intel_combo_phy.o \
+ display/intel_connector.o \
+ display/intel_display.o \
+ display/intel_display_power.o \
+ display/intel_dpio_phy.o \
+ display/intel_dpll_mgr.o \
+ display/intel_fbc.o \
+ display/intel_fifo_underrun.o \
+ display/intel_frontbuffer.o \
+ display/intel_hdcp.o \
+ display/intel_hotplug.o \
+ display/intel_lpe_audio.o \
+ display/intel_overlay.o \
+ display/intel_psr.o \
+ display/intel_quirks.o \
+ display/intel_sprite.o
+i915-$(CONFIG_ACPI) += \
+ display/intel_acpi.o \
+ display/intel_opregion.o
+i915-$(CONFIG_DRM_FBDEV_EMULATION) += \
+ display/intel_fbdev.o
# modesetting output/encoder code
-obj-y += display/
i915-y += \
display/dvo_ch7017.o \
display/dvo_ch7xxx.o \
@@ -242,8 +247,5 @@ i915-y += intel_gvt.o
include $(src)/gvt/Makefile
endif
-# LPE Audio for VLV and CHT
-i915-y += intel_lpe_audio.o
-
obj-$(CONFIG_DRM_I915) += i915.o
obj-$(CONFIG_DRM_I915_GVT_KVMGT) += gvt/kvmgt.o
--git a/drivers/gpu/drm/i915/Makefile.header-test b/drivers/gpu/drm/i915/Makefile.header-test
index 5a04858c9b7b..e6ba66f787f9 100644
--- a/drivers/gpu/drm/i915/Makefile.header-test
+++ b/drivers/gpu/drm/i915/Makefile.header-test
@@ -13,35 +13,11 @@ header_test := \
i915_scheduler_types.h \
i915_timeline_types.h \
i915_utils.h \
- intel_acpi.h \
- intel_atomic.h \
- intel_atomic_plane.h \
- intel_audio.h \
- intel_bios.h \
- intel_cdclk.h \
- intel_color.h \
- intel_combo_phy.h \
- intel_connector.h \
intel_csr.h \
- intel_display_power.h \
- intel_dpio_phy.h \
- intel_dpll_mgr.h \
intel_drv.h \
- intel_fbc.h \
- intel_fbdev.h \
- intel_fifo_underrun.h \
- intel_frontbuffer.h \
- intel_hdcp.h \
- intel_hotplug.h \
- intel_lpe_audio.h \
- intel_overlay.h \
- intel_pipe_crc.h \
intel_pm.h \
- intel_psr.h \
- intel_quirks.h \
intel_runtime_pm.h \
intel_sideband.h \
- intel_sprite.h \
intel_uncore.h \
intel_wakeref.h
--git a/drivers/gpu/drm/i915/display/Makefile.header-test b/drivers/gpu/drm/i915/display/Makefile.header-test
index 61e06cbb4b32..fc7d4e5bd2c6 100644
--- a/drivers/gpu/drm/i915/display/Makefile.header-test
+++ b/drivers/gpu/drm/i915/display/Makefile.header-test
@@ -2,7 +2,7 @@
# Copyright © 2019 Intel Corporation
# Test the headers are compilable as standalone units
-header_test := $(notdir $(wildcard $(src)/*.h))
+header_test := $(notdir $(filter-out %/intel_vbt_defs.h,$(wildcard $(src)/*.h)))
quiet_cmd_header_test = HDRTEST $@
cmd_header_test = echo "\#include \"$(<F)\"" > $@
diff --git a/drivers/gpu/drm/i915/intel_acpi.c b/drivers/gpu/drm/i915/display/intel_acpi.c
similarity index 100%
rename from drivers/gpu/drm/i915/intel_acpi.c
rename to drivers/gpu/drm/i915/display/intel_acpi.c
diff --git a/drivers/gpu/drm/i915/intel_acpi.h b/drivers/gpu/drm/i915/display/intel_acpi.h
similarity index 100%
rename from drivers/gpu/drm/i915/intel_acpi.h
rename to drivers/gpu/drm/i915/display/intel_acpi.h
diff --git a/drivers/gpu/drm/i915/intel_atomic.c b/drivers/gpu/drm/i915/display/intel_atomic.c
similarity index 100%
rename from drivers/gpu/drm/i915/intel_atomic.c
rename to drivers/gpu/drm/i915/display/intel_atomic.c
diff --git a/drivers/gpu/drm/i915/intel_atomic.h b/drivers/gpu/drm/i915/display/intel_atomic.h
similarity index 100%
rename from drivers/gpu/drm/i915/intel_atomic.h
rename to drivers/gpu/drm/i915/display/intel_atomic.h
diff --git a/drivers/gpu/drm/i915/intel_atomic_plane.c b/drivers/gpu/drm/i915/display/intel_atomic_plane.c
similarity index 100%
rename from drivers/gpu/drm/i915/intel_atomic_plane.c
rename to drivers/gpu/drm/i915/display/intel_atomic_plane.c
diff --git a/drivers/gpu/drm/i915/intel_atomic_plane.h b/drivers/gpu/drm/i915/display/intel_atomic_plane.h
similarity index 100%
rename from drivers/gpu/drm/i915/intel_atomic_plane.h
rename to drivers/gpu/drm/i915/display/intel_atomic_plane.h
diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/display/intel_audio.c
similarity index 100%
rename from drivers/gpu/drm/i915/intel_audio.c
rename to drivers/gpu/drm/i915/display/intel_audio.c
diff --git a/drivers/gpu/drm/i915/intel_audio.h b/drivers/gpu/drm/i915/display/intel_audio.h
similarity index 100%
rename from drivers/gpu/drm/i915/intel_audio.h
rename to drivers/gpu/drm/i915/display/intel_audio.h
diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c
similarity index 100%
rename from drivers/gpu/drm/i915/intel_bios.c
rename to drivers/gpu/drm/i915/display/intel_bios.c
diff --git a/drivers/gpu/drm/i915/intel_bios.h b/drivers/gpu/drm/i915/display/intel_bios.h
similarity index 100%
rename from drivers/gpu/drm/i915/intel_bios.h
rename to drivers/gpu/drm/i915/display/intel_bios.h
diff --git a/drivers/gpu/drm/i915/intel_bw.c b/drivers/gpu/drm/i915/display/intel_bw.c
similarity index 100%
rename from drivers/gpu/drm/i915/intel_bw.c
rename to drivers/gpu/drm/i915/display/intel_bw.c
diff --git a/drivers/gpu/drm/i915/intel_bw.h b/drivers/gpu/drm/i915/display/intel_bw.h
similarity index 100%
rename from drivers/gpu/drm/i915/intel_bw.h
rename to drivers/gpu/drm/i915/display/intel_bw.h
diff --git a/drivers/gpu/drm/i915/intel_cdclk.c b/drivers/gpu/drm/i915/display/intel_cdclk.c
similarity index 100%
rename from drivers/gpu/drm/i915/intel_cdclk.c
rename to drivers/gpu/drm/i915/display/intel_cdclk.c
diff --git a/drivers/gpu/drm/i915/intel_cdclk.h b/drivers/gpu/drm/i915/display/intel_cdclk.h
similarity index 100%
rename from drivers/gpu/drm/i915/intel_cdclk.h
rename to drivers/gpu/drm/i915/display/intel_cdclk.h
diff --git a/drivers/gpu/drm/i915/intel_color.c b/drivers/gpu/drm/i915/display/intel_color.c
similarity index 100%
rename from drivers/gpu/drm/i915/intel_color.c
rename to drivers/gpu/drm/i915/display/intel_color.c
diff --git a/drivers/gpu/drm/i915/intel_color.h b/drivers/gpu/drm/i915/display/intel_color.h
similarity index 100%
rename from drivers/gpu/drm/i915/intel_color.h
rename to drivers/gpu/drm/i915/display/intel_color.h
diff --git a/drivers/gpu/drm/i915/intel_combo_phy.c b/drivers/gpu/drm/i915/display/intel_combo_phy.c
similarity index 100%
rename from drivers/gpu/drm/i915/intel_combo_phy.c
rename to drivers/gpu/drm/i915/display/intel_combo_phy.c
diff --git a/drivers/gpu/drm/i915/intel_combo_phy.h b/drivers/gpu/drm/i915/display/intel_combo_phy.h
similarity index 100%
rename from drivers/gpu/drm/i915/intel_combo_phy.h
rename to drivers/gpu/drm/i915/display/intel_combo_phy.h
diff --git a/drivers/gpu/drm/i915/intel_connector.c b/drivers/gpu/drm/i915/display/intel_connector.c
similarity index 100%
rename from drivers/gpu/drm/i915/intel_connector.c
rename to drivers/gpu/drm/i915/display/intel_connector.c
diff --git a/drivers/gpu/drm/i915/intel_connector.h b/drivers/gpu/drm/i915/display/intel_connector.h
similarity index 100%
rename from drivers/gpu/drm/i915/intel_connector.h
rename to drivers/gpu/drm/i915/display/intel_connector.h
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
similarity index 100%
rename from drivers/gpu/drm/i915/intel_display.c
rename to drivers/gpu/drm/i915/display/intel_display.c
diff --git a/drivers/gpu/drm/i915/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h
similarity index 100%
rename from drivers/gpu/drm/i915/intel_display.h
rename to drivers/gpu/drm/i915/display/intel_display.h
diff --git a/drivers/gpu/drm/i915/intel_display_power.c b/drivers/gpu/drm/i915/display/intel_display_power.c
similarity index 100%
rename from drivers/gpu/drm/i915/intel_display_power.c
rename to drivers/gpu/drm/i915/display/intel_display_power.c
diff --git a/drivers/gpu/drm/i915/intel_display_power.h b/drivers/gpu/drm/i915/display/intel_display_power.h
similarity index 100%
rename from drivers/gpu/drm/i915/intel_display_power.h
rename to drivers/gpu/drm/i915/display/intel_display_power.h
diff --git a/drivers/gpu/drm/i915/intel_dpio_phy.c b/drivers/gpu/drm/i915/display/intel_dpio_phy.c
similarity index 100%
rename from drivers/gpu/drm/i915/intel_dpio_phy.c
rename to drivers/gpu/drm/i915/display/intel_dpio_phy.c
diff --git a/drivers/gpu/drm/i915/intel_dpio_phy.h b/drivers/gpu/drm/i915/display/intel_dpio_phy.h
similarity index 100%
rename from drivers/gpu/drm/i915/intel_dpio_phy.h
rename to drivers/gpu/drm/i915/display/intel_dpio_phy.h
diff --git a/drivers/gpu/drm/i915/intel_dpll_mgr.c b/drivers/gpu/drm/i915/display/intel_dpll_mgr.c
similarity index 100%
rename from drivers/gpu/drm/i915/intel_dpll_mgr.c
rename to drivers/gpu/drm/i915/display/intel_dpll_mgr.c
diff --git a/drivers/gpu/drm/i915/intel_dpll_mgr.h b/drivers/gpu/drm/i915/display/intel_dpll_mgr.h
similarity index 100%
rename from drivers/gpu/drm/i915/intel_dpll_mgr.h
rename to drivers/gpu/drm/i915/display/intel_dpll_mgr.h
diff --git a/drivers/gpu/drm/i915/intel_fbc.c b/drivers/gpu/drm/i915/display/intel_fbc.c
similarity index 100%
rename from drivers/gpu/drm/i915/intel_fbc.c
rename to drivers/gpu/drm/i915/display/intel_fbc.c
diff --git a/drivers/gpu/drm/i915/intel_fbc.h b/drivers/gpu/drm/i915/display/intel_fbc.h
similarity index 100%
rename from drivers/gpu/drm/i915/intel_fbc.h
rename to drivers/gpu/drm/i915/display/intel_fbc.h
diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/display/intel_fbdev.c
similarity index 100%
rename from drivers/gpu/drm/i915/intel_fbdev.c
rename to drivers/gpu/drm/i915/display/intel_fbdev.c
diff --git a/drivers/gpu/drm/i915/intel_fbdev.h b/drivers/gpu/drm/i915/display/intel_fbdev.h
similarity index 100%
rename from drivers/gpu/drm/i915/intel_fbdev.h
rename to drivers/gpu/drm/i915/display/intel_fbdev.h
diff --git a/drivers/gpu/drm/i915/intel_fifo_underrun.c b/drivers/gpu/drm/i915/display/intel_fifo_underrun.c
similarity index 100%
rename from drivers/gpu/drm/i915/intel_fifo_underrun.c
rename to drivers/gpu/drm/i915/display/intel_fifo_underrun.c
diff --git a/drivers/gpu/drm/i915/intel_fifo_underrun.h b/drivers/gpu/drm/i915/display/intel_fifo_underrun.h
similarity index 100%
rename from drivers/gpu/drm/i915/intel_fifo_underrun.h
rename to drivers/gpu/drm/i915/display/intel_fifo_underrun.h
diff --git a/drivers/gpu/drm/i915/intel_frontbuffer.c b/drivers/gpu/drm/i915/display/intel_frontbuffer.c
similarity index 100%
rename from drivers/gpu/drm/i915/intel_frontbuffer.c
rename to drivers/gpu/drm/i915/display/intel_frontbuffer.c
diff --git a/drivers/gpu/drm/i915/intel_frontbuffer.h b/drivers/gpu/drm/i915/display/intel_frontbuffer.h
similarity index 100%
rename from drivers/gpu/drm/i915/intel_frontbuffer.h
rename to drivers/gpu/drm/i915/display/intel_frontbuffer.h
diff --git a/drivers/gpu/drm/i915/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c
similarity index 100%
rename from drivers/gpu/drm/i915/intel_hdcp.c
rename to drivers/gpu/drm/i915/display/intel_hdcp.c
diff --git a/drivers/gpu/drm/i915/intel_hdcp.h b/drivers/gpu/drm/i915/display/intel_hdcp.h
similarity index 100%
rename from drivers/gpu/drm/i915/intel_hdcp.h
rename to drivers/gpu/drm/i915/display/intel_hdcp.h
diff --git a/drivers/gpu/drm/i915/intel_hotplug.c b/drivers/gpu/drm/i915/display/intel_hotplug.c
similarity index 100%
rename from drivers/gpu/drm/i915/intel_hotplug.c
rename to drivers/gpu/drm/i915/display/intel_hotplug.c
diff --git a/drivers/gpu/drm/i915/intel_hotplug.h b/drivers/gpu/drm/i915/display/intel_hotplug.h
similarity index 100%
rename from drivers/gpu/drm/i915/intel_hotplug.h
rename to drivers/gpu/drm/i915/display/intel_hotplug.h
diff --git a/drivers/gpu/drm/i915/intel_lpe_audio.c b/drivers/gpu/drm/i915/display/intel_lpe_audio.c
similarity index 100%
rename from drivers/gpu/drm/i915/intel_lpe_audio.c
rename to drivers/gpu/drm/i915/display/intel_lpe_audio.c
diff --git a/drivers/gpu/drm/i915/intel_lpe_audio.h b/drivers/gpu/drm/i915/display/intel_lpe_audio.h
similarity index 100%
rename from drivers/gpu/drm/i915/intel_lpe_audio.h
rename to drivers/gpu/drm/i915/display/intel_lpe_audio.h
diff --git a/drivers/gpu/drm/i915/intel_opregion.c b/drivers/gpu/drm/i915/display/intel_opregion.c
similarity index 100%
rename from drivers/gpu/drm/i915/intel_opregion.c
rename to drivers/gpu/drm/i915/display/intel_opregion.c
diff --git a/drivers/gpu/drm/i915/intel_opregion.h b/drivers/gpu/drm/i915/display/intel_opregion.h
similarity index 100%
rename from drivers/gpu/drm/i915/intel_opregion.h
rename to drivers/gpu/drm/i915/display/intel_opregion.h
diff --git a/drivers/gpu/drm/i915/intel_overlay.c b/drivers/gpu/drm/i915/display/intel_overlay.c
similarity index 100%
rename from drivers/gpu/drm/i915/intel_overlay.c
rename to drivers/gpu/drm/i915/display/intel_overlay.c
diff --git a/drivers/gpu/drm/i915/intel_overlay.h b/drivers/gpu/drm/i915/display/intel_overlay.h
similarity index 100%
rename from drivers/gpu/drm/i915/intel_overlay.h
rename to drivers/gpu/drm/i915/display/intel_overlay.h
diff --git a/drivers/gpu/drm/i915/intel_pipe_crc.c b/drivers/gpu/drm/i915/display/intel_pipe_crc.c
similarity index 100%
rename from drivers/gpu/drm/i915/intel_pipe_crc.c
rename to drivers/gpu/drm/i915/display/intel_pipe_crc.c
diff --git a/drivers/gpu/drm/i915/intel_pipe_crc.h b/drivers/gpu/drm/i915/display/intel_pipe_crc.h
similarity index 100%
rename from drivers/gpu/drm/i915/intel_pipe_crc.h
rename to drivers/gpu/drm/i915/display/intel_pipe_crc.h
diff --git a/drivers/gpu/drm/i915/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c
similarity index 100%
rename from drivers/gpu/drm/i915/intel_psr.c
rename to drivers/gpu/drm/i915/display/intel_psr.c
diff --git a/drivers/gpu/drm/i915/intel_psr.h b/drivers/gpu/drm/i915/display/intel_psr.h
similarity index 100%
rename from drivers/gpu/drm/i915/intel_psr.h
rename to drivers/gpu/drm/i915/display/intel_psr.h
diff --git a/drivers/gpu/drm/i915/intel_quirks.c b/drivers/gpu/drm/i915/display/intel_quirks.c
similarity index 100%
rename from drivers/gpu/drm/i915/intel_quirks.c
rename to drivers/gpu/drm/i915/display/intel_quirks.c
diff --git a/drivers/gpu/drm/i915/intel_quirks.h b/drivers/gpu/drm/i915/display/intel_quirks.h
similarity index 100%
rename from drivers/gpu/drm/i915/intel_quirks.h
rename to drivers/gpu/drm/i915/display/intel_quirks.h
diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/display/intel_sprite.c
similarity index 100%
rename from drivers/gpu/drm/i915/intel_sprite.c
rename to drivers/gpu/drm/i915/display/intel_sprite.c
diff --git a/drivers/gpu/drm/i915/intel_sprite.h b/drivers/gpu/drm/i915/display/intel_sprite.h
similarity index 100%
rename from drivers/gpu/drm/i915/intel_sprite.h
rename to drivers/gpu/drm/i915/display/intel_sprite.h
diff --git a/drivers/gpu/drm/i915/intel_vbt_defs.h b/drivers/gpu/drm/i915/display/intel_vbt_defs.h
similarity index 100%
rename from drivers/gpu/drm/i915/intel_vbt_defs.h
rename to drivers/gpu/drm/i915/display/intel_vbt_defs.h
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_clflush.c b/drivers/gpu/drm/i915/gem/i915_gem_clflush.c
index 537aa2337cc8..9018e12b536b 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_clflush.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_clflush.c
@@ -4,9 +4,10 @@
* Copyright © 2016 Intel Corporation
*/
+#include "display/intel_frontbuffer.h"
+
#include "i915_drv.h"
#include "i915_gem_clflush.h"
-#include "intel_frontbuffer.h"
static DEFINE_SPINLOCK(clflush_lock);
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_domain.c b/drivers/gpu/drm/i915/gem/i915_gem_domain.c
index bd180ef46aeb..2e3ce2a69653 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_domain.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_domain.c
@@ -4,13 +4,14 @@
* Copyright © 2014-2016 Intel Corporation
*/
+#include "display/intel_frontbuffer.h"
+
#include "i915_drv.h"
#include "i915_gem_clflush.h"
#include "i915_gem_gtt.h"
#include "i915_gem_ioctls.h"
#include "i915_gem_object.h"
#include "i915_vma.h"
-#include "intel_frontbuffer.h"
static void __i915_gem_object_flush_for_display(struct drm_i915_gem_object *obj)
{
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
index 528eea44dccf..5fae0e50aad0 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
@@ -12,6 +12,8 @@
#include <drm/drm_syncobj.h>
#include <drm/i915_drm.h>
+#include "display/intel_frontbuffer.h"
+
#include "gem/i915_gem_ioctls.h"
#include "gt/intel_context.h"
#include "gt/intel_gt_pm.h"
@@ -21,7 +23,6 @@
#include "i915_gem_context.h"
#include "i915_trace.h"
#include "intel_drv.h"
-#include "intel_frontbuffer.h"
enum {
FORCE_CPU_RELOC = 1,
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object.c b/drivers/gpu/drm/i915/gem/i915_gem_object.c
index 36b76c6a0a9d..ffd439904b08 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_object.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_object.c
@@ -22,12 +22,13 @@
*
*/
+#include "display/intel_frontbuffer.h"
+
#include "i915_drv.h"
#include "i915_gem_clflush.h"
#include "i915_gem_context.h"
#include "i915_gem_object.h"
#include "i915_globals.h"
-#include "intel_frontbuffer.h"
static struct i915_global_object {
struct i915_global base;
diff --git a/drivers/gpu/drm/i915/gt/intel_reset.c b/drivers/gpu/drm/i915/gt/intel_reset.c
index 6368b37f26d1..8ad6bbd12f63 100644
--- a/drivers/gpu/drm/i915/gt/intel_reset.c
+++ b/drivers/gpu/drm/i915/gt/intel_reset.c
@@ -7,6 +7,8 @@
#include <linux/sched/mm.h>
#include <linux/stop_machine.h>
+#include "display/intel_overlay.h"
+
#include "gem/i915_gem_context.h"
#include "i915_drv.h"
@@ -17,7 +19,6 @@
#include "intel_reset.h"
#include "intel_guc.h"
-#include "intel_overlay.h"
#define RESET_MAX_RETRIES 3
diff --git a/drivers/gpu/drm/i915/gvt/opregion.c b/drivers/gpu/drm/i915/gvt/opregion.c
index 276db53f1bf1..867e7629025b 100644
--- a/drivers/gpu/drm/i915/gvt/opregion.c
+++ b/drivers/gpu/drm/i915/gvt/opregion.c
@@ -30,7 +30,7 @@
* not do like this.
*/
#define _INTEL_BIOS_PRIVATE
-#include "intel_vbt_defs.h"
+#include "display/intel_vbt_defs.h"
#define OPREGION_SIGNATURE "IntelGraphicsMem"
#define MBOX_VBT (1<<3)
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index b3425c7dc6bb..081595e58e5f 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -33,7 +33,10 @@
#include <drm/drm_fourcc.h>
#include "display/intel_dp.h"
+#include "display/intel_fbc.h"
+#include "display/intel_hdcp.h"
#include "display/intel_hdmi.h"
+#include "display/intel_psr.h"
#include "gem/i915_gem_context.h"
#include "gt/intel_reset.h"
@@ -42,11 +45,8 @@
#include "i915_irq.h"
#include "intel_csr.h"
#include "intel_drv.h"
-#include "intel_fbc.h"
#include "intel_guc_submission.h"
-#include "intel_hdcp.h"
#include "intel_pm.h"
-#include "intel_psr.h"
#include "intel_sideband.h"
static inline struct drm_i915_private *node_to_i915(struct drm_info_node *node)
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 9b72387c4101..23a1e441bcf9 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -47,8 +47,17 @@
#include <drm/drm_probe_helper.h>
#include <drm/i915_drm.h>
+#include "display/intel_acpi.h"
+#include "display/intel_audio.h"
+#include "display/intel_bw.h"
+#include "display/intel_cdclk.h"
#include "display/intel_dp.h"
+#include "display/intel_fbdev.h"
#include "display/intel_gmbus.h"
+#include "display/intel_hotplug.h"
+#include "display/intel_overlay.h"
+#include "display/intel_pipe_crc.h"
+#include "display/intel_sprite.h"
#include "gem/i915_gem_context.h"
#include "gem/i915_gem_ioctls.h"
@@ -63,18 +72,9 @@
#include "i915_query.h"
#include "i915_trace.h"
#include "i915_vgpu.h"
-#include "intel_acpi.h"
-#include "intel_audio.h"
-#include "intel_bw.h"
-#include "intel_cdclk.h"
#include "intel_csr.h"
#include "intel_drv.h"
-#include "intel_fbdev.h"
-#include "intel_hotplug.h"
-#include "intel_overlay.h"
-#include "intel_pipe_crc.h"
#include "intel_pm.h"
-#include "intel_sprite.h"
#include "intel_uc.h"
static struct drm_driver driver;
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index eb98d285d290..f2abdce68552 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -63,17 +63,18 @@
#include "i915_reg.h"
#include "i915_utils.h"
+#include "display/intel_bios.h"
+#include "display/intel_display.h"
+#include "display/intel_display_power.h"
+#include "display/intel_dpll_mgr.h"
+#include "display/intel_frontbuffer.h"
+#include "display/intel_opregion.h"
+
#include "gt/intel_lrc.h"
#include "gt/intel_engine.h"
#include "gt/intel_workarounds.h"
-#include "intel_bios.h"
#include "intel_device_info.h"
-#include "intel_display.h"
-#include "intel_display_power.h"
-#include "intel_dpll_mgr.h"
-#include "intel_frontbuffer.h"
-#include "intel_opregion.h"
#include "intel_runtime_pm.h"
#include "intel_uc.h"
#include "intel_uncore.h"
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 4017ecf561f6..7092d0cd5d2b 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -38,6 +38,9 @@
#include <linux/dma-buf.h>
#include <linux/mman.h>
+#include "display/intel_display.h"
+#include "display/intel_frontbuffer.h"
+
#include "gem/i915_gem_clflush.h"
#include "gem/i915_gem_context.h"
#include "gem/i915_gem_ioctls.h"
@@ -54,9 +57,7 @@
#include "i915_trace.h"
#include "i915_vgpu.h"
-#include "intel_display.h"
#include "intel_drv.h"
-#include "intel_frontbuffer.h"
#include "intel_pm.h"
static int
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
index e70675bfb51d..edaf8f534d60 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -35,12 +35,13 @@
#include <drm/i915_drm.h>
+#include "display/intel_frontbuffer.h"
+
#include "i915_drv.h"
#include "i915_scatterlist.h"
#include "i915_trace.h"
#include "i915_vgpu.h"
#include "intel_drv.h"
-#include "intel_frontbuffer.h"
#define I915_GFP_ALLOW_FAIL (GFP_KERNEL | __GFP_RETRY_MAYFAIL | __GFP_NOWARN)
diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
index d7f164c9f2eb..6dff91034043 100644
--- a/drivers/gpu/drm/i915/i915_gpu_error.c
+++ b/drivers/gpu/drm/i915/i915_gpu_error.c
@@ -36,14 +36,15 @@
#include <drm/drm_print.h>
+#include "display/intel_atomic.h"
+#include "display/intel_overlay.h"
+
#include "gem/i915_gem_context.h"
#include "i915_drv.h"
#include "i915_gpu_error.h"
#include "i915_scatterlist.h"
-#include "intel_atomic.h"
#include "intel_csr.h"
-#include "intel_overlay.h"
static inline const struct intel_engine_cs *
engine_lookup(const struct drm_i915_private *i915, unsigned int id)
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index cd9edddd6718..b7f6e3915562 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -37,15 +37,16 @@
#include <drm/drm_irq.h>
#include <drm/i915_drm.h>
+#include "display/intel_fifo_underrun.h"
+#include "display/intel_hotplug.h"
+#include "display/intel_lpe_audio.h"
+#include "display/intel_psr.h"
+
#include "i915_drv.h"
#include "i915_irq.h"
#include "i915_trace.h"
#include "intel_drv.h"
-#include "intel_fifo_underrun.h"
-#include "intel_hotplug.h"
-#include "intel_lpe_audio.h"
#include "intel_pm.h"
-#include "intel_psr.h"
/**
* DOC: interrupt handling
diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
index 482f1d0f1770..6892c0c34f3c 100644
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@ -28,10 +28,11 @@
#include <drm/drm_drv.h>
+#include "display/intel_fbdev.h"
+
#include "i915_drv.h"
#include "i915_globals.h"
#include "i915_selftest.h"
-#include "intel_fbdev.h"
#define PLATFORM(x) .platform = (x)
#define GEN(x) .gen = (x), .gen_mask = BIT((x) - 1)
diff --git a/drivers/gpu/drm/i915/i915_suspend.c b/drivers/gpu/drm/i915/i915_suspend.c
index 1e38a60a8ec7..a08d7d16621b 100644
--- a/drivers/gpu/drm/i915/i915_suspend.c
+++ b/drivers/gpu/drm/i915/i915_suspend.c
@@ -26,11 +26,11 @@
#include <drm/i915_drm.h>
+#include "display/intel_fbc.h"
#include "display/intel_gmbus.h"
#include "i915_reg.h"
#include "intel_drv.h"
-#include "intel_fbc.h"
static void i915_save_display(struct drm_i915_private *dev_priv)
{
diff --git a/drivers/gpu/drm/i915/i915_vma.c b/drivers/gpu/drm/i915/i915_vma.c
index cb341e4acf99..e3ddaedeb3b1 100644
--- a/drivers/gpu/drm/i915/i915_vma.c
+++ b/drivers/gpu/drm/i915/i915_vma.c
@@ -22,15 +22,15 @@
*
*/
-#include "gt/intel_engine.h"
+#include <drm/drm_gem.h>
-#include "i915_vma.h"
+#include "display/intel_frontbuffer.h"
+
+#include "gt/intel_engine.h"
#include "i915_drv.h"
#include "i915_globals.h"
-#include "intel_frontbuffer.h"
-
-#include <drm/drm_gem.h>
+#include "i915_vma.h"
static struct i915_global_vma {
struct i915_global base;
diff --git a/drivers/gpu/drm/i915/intel_device_info.h b/drivers/gpu/drm/i915/intel_device_info.h
index 3ea953a230b3..b15b4b5e389f 100644
--- a/drivers/gpu/drm/i915/intel_device_info.h
+++ b/drivers/gpu/drm/i915/intel_device_info.h
@@ -27,12 +27,12 @@
#include <uapi/drm/i915_drm.h>
+#include "display/intel_display.h"
+
#include "gt/intel_engine_types.h"
#include "gt/intel_context_types.h"
#include "gt/intel_sseu.h"
-#include "intel_display.h"
-
struct drm_printer;
struct drm_i915_private;
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 2c7f3ebc0117..969fb8c208f0 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -33,13 +33,14 @@
#include <drm/drm_fourcc.h>
#include <drm/drm_plane_helper.h>
+#include "display/intel_atomic.h"
+#include "display/intel_fbc.h"
+#include "display/intel_sprite.h"
+
#include "i915_drv.h"
#include "i915_irq.h"
-#include "intel_atomic.h"
#include "intel_drv.h"
-#include "intel_fbc.h"
#include "intel_pm.h"
-#include "intel_sprite.h"
#include "intel_sideband.h"
#include "../../../platform/x86/intel_ips.h"
diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.h b/drivers/gpu/drm/i915/intel_runtime_pm.h
index a7acceb13473..22cc1b0cbf83 100644
--- a/drivers/gpu/drm/i915/intel_runtime_pm.h
+++ b/drivers/gpu/drm/i915/intel_runtime_pm.h
@@ -8,7 +8,8 @@
#include <linux/types.h>
-#include "intel_display.h"
+#include "display/intel_display.h"
+
#include "intel_wakeref.h"
struct drm_i915_private;
--
2.20.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 17+ messages in thread* Re: [PATCH v2 3/3] drm/i915: move modesetting core code under display/
2019-06-13 8:44 ` [PATCH v2 3/3] drm/i915: move modesetting core " Jani Nikula
@ 2019-06-13 14:12 ` Maarten Lankhorst
2019-06-17 8:58 ` Jani Nikula
0 siblings, 1 reply; 17+ messages in thread
From: Maarten Lankhorst @ 2019-06-13 14:12 UTC (permalink / raw)
To: Jani Nikula, intel-gfx
Op 13-06-2019 om 10:44 schreef Jani Nikula:
> Now that we have a new subdirectory for display code, continue by moving
> modesetting core code.
>
> display/intel_frontbuffer.h sticks out like a sore thumb, otherwise this
> is, again, a surprisingly clean operation.
>
> v2:
> - don't move intel_sideband.[ch] (Ville)
> - use tabs for Makefile file lists and sort them
>
> Cc: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
> Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
For whole series:
Acked-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> ---
> drivers/gpu/drm/i915/Makefile | 66 ++++++++++---------
> drivers/gpu/drm/i915/Makefile.header-test | 24 -------
> .../gpu/drm/i915/display/Makefile.header-test | 2 +-
> .../gpu/drm/i915/{ => display}/intel_acpi.c | 0
> .../gpu/drm/i915/{ => display}/intel_acpi.h | 0
> .../gpu/drm/i915/{ => display}/intel_atomic.c | 0
> .../gpu/drm/i915/{ => display}/intel_atomic.h | 0
> .../i915/{ => display}/intel_atomic_plane.c | 0
> .../i915/{ => display}/intel_atomic_plane.h | 0
> .../gpu/drm/i915/{ => display}/intel_audio.c | 0
> .../gpu/drm/i915/{ => display}/intel_audio.h | 0
> .../gpu/drm/i915/{ => display}/intel_bios.c | 0
> .../gpu/drm/i915/{ => display}/intel_bios.h | 0
> drivers/gpu/drm/i915/{ => display}/intel_bw.c | 0
> drivers/gpu/drm/i915/{ => display}/intel_bw.h | 0
> .../gpu/drm/i915/{ => display}/intel_cdclk.c | 0
> .../gpu/drm/i915/{ => display}/intel_cdclk.h | 0
> .../gpu/drm/i915/{ => display}/intel_color.c | 0
> .../gpu/drm/i915/{ => display}/intel_color.h | 0
> .../drm/i915/{ => display}/intel_combo_phy.c | 0
> .../drm/i915/{ => display}/intel_combo_phy.h | 0
> .../drm/i915/{ => display}/intel_connector.c | 0
> .../drm/i915/{ => display}/intel_connector.h | 0
> .../drm/i915/{ => display}/intel_display.c | 0
> .../drm/i915/{ => display}/intel_display.h | 0
> .../i915/{ => display}/intel_display_power.c | 0
> .../i915/{ => display}/intel_display_power.h | 0
> .../drm/i915/{ => display}/intel_dpio_phy.c | 0
> .../drm/i915/{ => display}/intel_dpio_phy.h | 0
> .../drm/i915/{ => display}/intel_dpll_mgr.c | 0
> .../drm/i915/{ => display}/intel_dpll_mgr.h | 0
> .../gpu/drm/i915/{ => display}/intel_fbc.c | 0
> .../gpu/drm/i915/{ => display}/intel_fbc.h | 0
> .../gpu/drm/i915/{ => display}/intel_fbdev.c | 0
> .../gpu/drm/i915/{ => display}/intel_fbdev.h | 0
> .../i915/{ => display}/intel_fifo_underrun.c | 0
> .../i915/{ => display}/intel_fifo_underrun.h | 0
> .../i915/{ => display}/intel_frontbuffer.c | 0
> .../i915/{ => display}/intel_frontbuffer.h | 0
> .../gpu/drm/i915/{ => display}/intel_hdcp.c | 0
> .../gpu/drm/i915/{ => display}/intel_hdcp.h | 0
> .../drm/i915/{ => display}/intel_hotplug.c | 0
> .../drm/i915/{ => display}/intel_hotplug.h | 0
> .../drm/i915/{ => display}/intel_lpe_audio.c | 0
> .../drm/i915/{ => display}/intel_lpe_audio.h | 0
> .../drm/i915/{ => display}/intel_opregion.c | 0
> .../drm/i915/{ => display}/intel_opregion.h | 0
> .../drm/i915/{ => display}/intel_overlay.c | 0
> .../drm/i915/{ => display}/intel_overlay.h | 0
> .../drm/i915/{ => display}/intel_pipe_crc.c | 0
> .../drm/i915/{ => display}/intel_pipe_crc.h | 0
> .../gpu/drm/i915/{ => display}/intel_psr.c | 0
> .../gpu/drm/i915/{ => display}/intel_psr.h | 0
> .../gpu/drm/i915/{ => display}/intel_quirks.c | 0
> .../gpu/drm/i915/{ => display}/intel_quirks.h | 0
> .../gpu/drm/i915/{ => display}/intel_sprite.c | 0
> .../gpu/drm/i915/{ => display}/intel_sprite.h | 0
> .../drm/i915/{ => display}/intel_vbt_defs.h | 0
> drivers/gpu/drm/i915/gem/i915_gem_clflush.c | 3 +-
> drivers/gpu/drm/i915/gem/i915_gem_domain.c | 3 +-
> .../gpu/drm/i915/gem/i915_gem_execbuffer.c | 3 +-
> drivers/gpu/drm/i915/gem/i915_gem_object.c | 3 +-
> drivers/gpu/drm/i915/gt/intel_reset.c | 3 +-
> drivers/gpu/drm/i915/gvt/opregion.c | 2 +-
> drivers/gpu/drm/i915/i915_debugfs.c | 6 +-
> drivers/gpu/drm/i915/i915_drv.c | 18 ++---
> drivers/gpu/drm/i915/i915_drv.h | 13 ++--
> drivers/gpu/drm/i915/i915_gem.c | 5 +-
> drivers/gpu/drm/i915/i915_gem_gtt.c | 3 +-
> drivers/gpu/drm/i915/i915_gpu_error.c | 5 +-
> drivers/gpu/drm/i915/i915_irq.c | 9 +--
> drivers/gpu/drm/i915/i915_pci.c | 3 +-
> drivers/gpu/drm/i915/i915_suspend.c | 2 +-
> drivers/gpu/drm/i915/i915_vma.c | 10 +--
> drivers/gpu/drm/i915/intel_device_info.h | 4 +-
> drivers/gpu/drm/i915/intel_pm.c | 7 +-
> drivers/gpu/drm/i915/intel_runtime_pm.h | 3 +-
> 77 files changed, 94 insertions(+), 103 deletions(-)
> rename drivers/gpu/drm/i915/{ => display}/intel_acpi.c (100%)
> rename drivers/gpu/drm/i915/{ => display}/intel_acpi.h (100%)
> rename drivers/gpu/drm/i915/{ => display}/intel_atomic.c (100%)
> rename drivers/gpu/drm/i915/{ => display}/intel_atomic.h (100%)
> rename drivers/gpu/drm/i915/{ => display}/intel_atomic_plane.c (100%)
> rename drivers/gpu/drm/i915/{ => display}/intel_atomic_plane.h (100%)
> rename drivers/gpu/drm/i915/{ => display}/intel_audio.c (100%)
> rename drivers/gpu/drm/i915/{ => display}/intel_audio.h (100%)
> rename drivers/gpu/drm/i915/{ => display}/intel_bios.c (100%)
> rename drivers/gpu/drm/i915/{ => display}/intel_bios.h (100%)
> rename drivers/gpu/drm/i915/{ => display}/intel_bw.c (100%)
> rename drivers/gpu/drm/i915/{ => display}/intel_bw.h (100%)
> rename drivers/gpu/drm/i915/{ => display}/intel_cdclk.c (100%)
> rename drivers/gpu/drm/i915/{ => display}/intel_cdclk.h (100%)
> rename drivers/gpu/drm/i915/{ => display}/intel_color.c (100%)
> rename drivers/gpu/drm/i915/{ => display}/intel_color.h (100%)
> rename drivers/gpu/drm/i915/{ => display}/intel_combo_phy.c (100%)
> rename drivers/gpu/drm/i915/{ => display}/intel_combo_phy.h (100%)
> rename drivers/gpu/drm/i915/{ => display}/intel_connector.c (100%)
> rename drivers/gpu/drm/i915/{ => display}/intel_connector.h (100%)
> rename drivers/gpu/drm/i915/{ => display}/intel_display.c (100%)
> rename drivers/gpu/drm/i915/{ => display}/intel_display.h (100%)
> rename drivers/gpu/drm/i915/{ => display}/intel_display_power.c (100%)
> rename drivers/gpu/drm/i915/{ => display}/intel_display_power.h (100%)
> rename drivers/gpu/drm/i915/{ => display}/intel_dpio_phy.c (100%)
> rename drivers/gpu/drm/i915/{ => display}/intel_dpio_phy.h (100%)
> rename drivers/gpu/drm/i915/{ => display}/intel_dpll_mgr.c (100%)
> rename drivers/gpu/drm/i915/{ => display}/intel_dpll_mgr.h (100%)
> rename drivers/gpu/drm/i915/{ => display}/intel_fbc.c (100%)
> rename drivers/gpu/drm/i915/{ => display}/intel_fbc.h (100%)
> rename drivers/gpu/drm/i915/{ => display}/intel_fbdev.c (100%)
> rename drivers/gpu/drm/i915/{ => display}/intel_fbdev.h (100%)
> rename drivers/gpu/drm/i915/{ => display}/intel_fifo_underrun.c (100%)
> rename drivers/gpu/drm/i915/{ => display}/intel_fifo_underrun.h (100%)
> rename drivers/gpu/drm/i915/{ => display}/intel_frontbuffer.c (100%)
> rename drivers/gpu/drm/i915/{ => display}/intel_frontbuffer.h (100%)
> rename drivers/gpu/drm/i915/{ => display}/intel_hdcp.c (100%)
> rename drivers/gpu/drm/i915/{ => display}/intel_hdcp.h (100%)
> rename drivers/gpu/drm/i915/{ => display}/intel_hotplug.c (100%)
> rename drivers/gpu/drm/i915/{ => display}/intel_hotplug.h (100%)
> rename drivers/gpu/drm/i915/{ => display}/intel_lpe_audio.c (100%)
> rename drivers/gpu/drm/i915/{ => display}/intel_lpe_audio.h (100%)
> rename drivers/gpu/drm/i915/{ => display}/intel_opregion.c (100%)
> rename drivers/gpu/drm/i915/{ => display}/intel_opregion.h (100%)
> rename drivers/gpu/drm/i915/{ => display}/intel_overlay.c (100%)
> rename drivers/gpu/drm/i915/{ => display}/intel_overlay.h (100%)
> rename drivers/gpu/drm/i915/{ => display}/intel_pipe_crc.c (100%)
> rename drivers/gpu/drm/i915/{ => display}/intel_pipe_crc.h (100%)
> rename drivers/gpu/drm/i915/{ => display}/intel_psr.c (100%)
> rename drivers/gpu/drm/i915/{ => display}/intel_psr.h (100%)
> rename drivers/gpu/drm/i915/{ => display}/intel_quirks.c (100%)
> rename drivers/gpu/drm/i915/{ => display}/intel_quirks.h (100%)
> rename drivers/gpu/drm/i915/{ => display}/intel_sprite.c (100%)
> rename drivers/gpu/drm/i915/{ => display}/intel_sprite.h (100%)
> rename drivers/gpu/drm/i915/{ => display}/intel_vbt_defs.h (100%)
>
> diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
> index 649f286887b7..91355c2ea8a5 100644
> --- a/drivers/gpu/drm/i915/Makefile
> +++ b/drivers/gpu/drm/i915/Makefile
> @@ -51,8 +51,9 @@ i915-y += i915_drv.o \
> intel_device_info.o \
> intel_pm.o \
> intel_runtime_pm.o \
> - intel_wakeref.o \
> - intel_uncore.o
> + intel_sideband.o \
> + intel_uncore.o \
> + intel_wakeref.o
>
> # core library code
> i915-y += \
> @@ -63,7 +64,7 @@ i915-y += \
> i915_user_extensions.o
>
> i915-$(CONFIG_COMPAT) += i915_ioc32.o
> -i915-$(CONFIG_DEBUG_FS) += i915_debugfs.o intel_pipe_crc.o
> +i915-$(CONFIG_DEBUG_FS) += i915_debugfs.o display/intel_pipe_crc.o
> i915-$(CONFIG_PERF_EVENTS) += i915_pmu.o
>
> # "Graphics Technology" (aka we talk to the gpu)
> @@ -149,34 +150,38 @@ i915-y += intel_renderstate_gen6.o \
> intel_renderstate_gen9.o
>
> # modesetting core code
> -i915-y += intel_audio.o \
> - intel_atomic.o \
> - intel_atomic_plane.o \
> - intel_bios.o \
> - intel_bw.o \
> - intel_cdclk.o \
> - intel_color.o \
> - intel_combo_phy.o \
> - intel_connector.o \
> - intel_display.o \
> - intel_display_power.o \
> - intel_dpio_phy.o \
> - intel_dpll_mgr.o \
> - intel_fbc.o \
> - intel_fifo_underrun.o \
> - intel_frontbuffer.o \
> - intel_hdcp.o \
> - intel_hotplug.o \
> - intel_overlay.o \
> - intel_psr.o \
> - intel_quirks.o \
> - intel_sideband.o \
> - intel_sprite.o
> -i915-$(CONFIG_ACPI) += intel_acpi.o intel_opregion.o
> -i915-$(CONFIG_DRM_FBDEV_EMULATION) += intel_fbdev.o
> +obj-y += display/
> +i915-y += \
> + display/intel_atomic.o \
> + display/intel_atomic_plane.o \
> + display/intel_audio.o \
> + display/intel_bios.o \
> + display/intel_bw.o \
> + display/intel_cdclk.o \
> + display/intel_color.o \
> + display/intel_combo_phy.o \
> + display/intel_connector.o \
> + display/intel_display.o \
> + display/intel_display_power.o \
> + display/intel_dpio_phy.o \
> + display/intel_dpll_mgr.o \
> + display/intel_fbc.o \
> + display/intel_fifo_underrun.o \
> + display/intel_frontbuffer.o \
> + display/intel_hdcp.o \
> + display/intel_hotplug.o \
> + display/intel_lpe_audio.o \
> + display/intel_overlay.o \
> + display/intel_psr.o \
> + display/intel_quirks.o \
> + display/intel_sprite.o
> +i915-$(CONFIG_ACPI) += \
> + display/intel_acpi.o \
> + display/intel_opregion.o
> +i915-$(CONFIG_DRM_FBDEV_EMULATION) += \
> + display/intel_fbdev.o
>
> # modesetting output/encoder code
> -obj-y += display/
> i915-y += \
> display/dvo_ch7017.o \
> display/dvo_ch7xxx.o \
> @@ -242,8 +247,5 @@ i915-y += intel_gvt.o
> include $(src)/gvt/Makefile
> endif
>
> -# LPE Audio for VLV and CHT
> -i915-y += intel_lpe_audio.o
> -
> obj-$(CONFIG_DRM_I915) += i915.o
> obj-$(CONFIG_DRM_I915_GVT_KVMGT) += gvt/kvmgt.o
> diff --git a/drivers/gpu/drm/i915/Makefile.header-test b/drivers/gpu/drm/i915/Makefile.header-test
> index 5a04858c9b7b..e6ba66f787f9 100644
> --- a/drivers/gpu/drm/i915/Makefile.header-test
> +++ b/drivers/gpu/drm/i915/Makefile.header-test
> @@ -13,35 +13,11 @@ header_test := \
> i915_scheduler_types.h \
> i915_timeline_types.h \
> i915_utils.h \
> - intel_acpi.h \
> - intel_atomic.h \
> - intel_atomic_plane.h \
> - intel_audio.h \
> - intel_bios.h \
> - intel_cdclk.h \
> - intel_color.h \
> - intel_combo_phy.h \
> - intel_connector.h \
> intel_csr.h \
> - intel_display_power.h \
> - intel_dpio_phy.h \
> - intel_dpll_mgr.h \
> intel_drv.h \
> - intel_fbc.h \
> - intel_fbdev.h \
> - intel_fifo_underrun.h \
> - intel_frontbuffer.h \
> - intel_hdcp.h \
> - intel_hotplug.h \
> - intel_lpe_audio.h \
> - intel_overlay.h \
> - intel_pipe_crc.h \
> intel_pm.h \
> - intel_psr.h \
> - intel_quirks.h \
> intel_runtime_pm.h \
> intel_sideband.h \
> - intel_sprite.h \
> intel_uncore.h \
> intel_wakeref.h
>
> diff --git a/drivers/gpu/drm/i915/display/Makefile.header-test b/drivers/gpu/drm/i915/display/Makefile.header-test
> index 61e06cbb4b32..fc7d4e5bd2c6 100644
> --- a/drivers/gpu/drm/i915/display/Makefile.header-test
> +++ b/drivers/gpu/drm/i915/display/Makefile.header-test
> @@ -2,7 +2,7 @@
> # Copyright © 2019 Intel Corporation
>
> # Test the headers are compilable as standalone units
> -header_test := $(notdir $(wildcard $(src)/*.h))
> +header_test := $(notdir $(filter-out %/intel_vbt_defs.h,$(wildcard $(src)/*.h)))
>
> quiet_cmd_header_test = HDRTEST $@
> cmd_header_test = echo "\#include \"$(<F)\"" > $@
> diff --git a/drivers/gpu/drm/i915/intel_acpi.c b/drivers/gpu/drm/i915/display/intel_acpi.c
> similarity index 100%
> rename from drivers/gpu/drm/i915/intel_acpi.c
> rename to drivers/gpu/drm/i915/display/intel_acpi.c
> diff --git a/drivers/gpu/drm/i915/intel_acpi.h b/drivers/gpu/drm/i915/display/intel_acpi.h
> similarity index 100%
> rename from drivers/gpu/drm/i915/intel_acpi.h
> rename to drivers/gpu/drm/i915/display/intel_acpi.h
> diff --git a/drivers/gpu/drm/i915/intel_atomic.c b/drivers/gpu/drm/i915/display/intel_atomic.c
> similarity index 100%
> rename from drivers/gpu/drm/i915/intel_atomic.c
> rename to drivers/gpu/drm/i915/display/intel_atomic.c
> diff --git a/drivers/gpu/drm/i915/intel_atomic.h b/drivers/gpu/drm/i915/display/intel_atomic.h
> similarity index 100%
> rename from drivers/gpu/drm/i915/intel_atomic.h
> rename to drivers/gpu/drm/i915/display/intel_atomic.h
> diff --git a/drivers/gpu/drm/i915/intel_atomic_plane.c b/drivers/gpu/drm/i915/display/intel_atomic_plane.c
> similarity index 100%
> rename from drivers/gpu/drm/i915/intel_atomic_plane.c
> rename to drivers/gpu/drm/i915/display/intel_atomic_plane.c
> diff --git a/drivers/gpu/drm/i915/intel_atomic_plane.h b/drivers/gpu/drm/i915/display/intel_atomic_plane.h
> similarity index 100%
> rename from drivers/gpu/drm/i915/intel_atomic_plane.h
> rename to drivers/gpu/drm/i915/display/intel_atomic_plane.h
> diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/display/intel_audio.c
> similarity index 100%
> rename from drivers/gpu/drm/i915/intel_audio.c
> rename to drivers/gpu/drm/i915/display/intel_audio.c
> diff --git a/drivers/gpu/drm/i915/intel_audio.h b/drivers/gpu/drm/i915/display/intel_audio.h
> similarity index 100%
> rename from drivers/gpu/drm/i915/intel_audio.h
> rename to drivers/gpu/drm/i915/display/intel_audio.h
> diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c
> similarity index 100%
> rename from drivers/gpu/drm/i915/intel_bios.c
> rename to drivers/gpu/drm/i915/display/intel_bios.c
> diff --git a/drivers/gpu/drm/i915/intel_bios.h b/drivers/gpu/drm/i915/display/intel_bios.h
> similarity index 100%
> rename from drivers/gpu/drm/i915/intel_bios.h
> rename to drivers/gpu/drm/i915/display/intel_bios.h
> diff --git a/drivers/gpu/drm/i915/intel_bw.c b/drivers/gpu/drm/i915/display/intel_bw.c
> similarity index 100%
> rename from drivers/gpu/drm/i915/intel_bw.c
> rename to drivers/gpu/drm/i915/display/intel_bw.c
> diff --git a/drivers/gpu/drm/i915/intel_bw.h b/drivers/gpu/drm/i915/display/intel_bw.h
> similarity index 100%
> rename from drivers/gpu/drm/i915/intel_bw.h
> rename to drivers/gpu/drm/i915/display/intel_bw.h
> diff --git a/drivers/gpu/drm/i915/intel_cdclk.c b/drivers/gpu/drm/i915/display/intel_cdclk.c
> similarity index 100%
> rename from drivers/gpu/drm/i915/intel_cdclk.c
> rename to drivers/gpu/drm/i915/display/intel_cdclk.c
> diff --git a/drivers/gpu/drm/i915/intel_cdclk.h b/drivers/gpu/drm/i915/display/intel_cdclk.h
> similarity index 100%
> rename from drivers/gpu/drm/i915/intel_cdclk.h
> rename to drivers/gpu/drm/i915/display/intel_cdclk.h
> diff --git a/drivers/gpu/drm/i915/intel_color.c b/drivers/gpu/drm/i915/display/intel_color.c
> similarity index 100%
> rename from drivers/gpu/drm/i915/intel_color.c
> rename to drivers/gpu/drm/i915/display/intel_color.c
> diff --git a/drivers/gpu/drm/i915/intel_color.h b/drivers/gpu/drm/i915/display/intel_color.h
> similarity index 100%
> rename from drivers/gpu/drm/i915/intel_color.h
> rename to drivers/gpu/drm/i915/display/intel_color.h
> diff --git a/drivers/gpu/drm/i915/intel_combo_phy.c b/drivers/gpu/drm/i915/display/intel_combo_phy.c
> similarity index 100%
> rename from drivers/gpu/drm/i915/intel_combo_phy.c
> rename to drivers/gpu/drm/i915/display/intel_combo_phy.c
> diff --git a/drivers/gpu/drm/i915/intel_combo_phy.h b/drivers/gpu/drm/i915/display/intel_combo_phy.h
> similarity index 100%
> rename from drivers/gpu/drm/i915/intel_combo_phy.h
> rename to drivers/gpu/drm/i915/display/intel_combo_phy.h
> diff --git a/drivers/gpu/drm/i915/intel_connector.c b/drivers/gpu/drm/i915/display/intel_connector.c
> similarity index 100%
> rename from drivers/gpu/drm/i915/intel_connector.c
> rename to drivers/gpu/drm/i915/display/intel_connector.c
> diff --git a/drivers/gpu/drm/i915/intel_connector.h b/drivers/gpu/drm/i915/display/intel_connector.h
> similarity index 100%
> rename from drivers/gpu/drm/i915/intel_connector.h
> rename to drivers/gpu/drm/i915/display/intel_connector.h
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> similarity index 100%
> rename from drivers/gpu/drm/i915/intel_display.c
> rename to drivers/gpu/drm/i915/display/intel_display.c
> diff --git a/drivers/gpu/drm/i915/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h
> similarity index 100%
> rename from drivers/gpu/drm/i915/intel_display.h
> rename to drivers/gpu/drm/i915/display/intel_display.h
> diff --git a/drivers/gpu/drm/i915/intel_display_power.c b/drivers/gpu/drm/i915/display/intel_display_power.c
> similarity index 100%
> rename from drivers/gpu/drm/i915/intel_display_power.c
> rename to drivers/gpu/drm/i915/display/intel_display_power.c
> diff --git a/drivers/gpu/drm/i915/intel_display_power.h b/drivers/gpu/drm/i915/display/intel_display_power.h
> similarity index 100%
> rename from drivers/gpu/drm/i915/intel_display_power.h
> rename to drivers/gpu/drm/i915/display/intel_display_power.h
> diff --git a/drivers/gpu/drm/i915/intel_dpio_phy.c b/drivers/gpu/drm/i915/display/intel_dpio_phy.c
> similarity index 100%
> rename from drivers/gpu/drm/i915/intel_dpio_phy.c
> rename to drivers/gpu/drm/i915/display/intel_dpio_phy.c
> diff --git a/drivers/gpu/drm/i915/intel_dpio_phy.h b/drivers/gpu/drm/i915/display/intel_dpio_phy.h
> similarity index 100%
> rename from drivers/gpu/drm/i915/intel_dpio_phy.h
> rename to drivers/gpu/drm/i915/display/intel_dpio_phy.h
> diff --git a/drivers/gpu/drm/i915/intel_dpll_mgr.c b/drivers/gpu/drm/i915/display/intel_dpll_mgr.c
> similarity index 100%
> rename from drivers/gpu/drm/i915/intel_dpll_mgr.c
> rename to drivers/gpu/drm/i915/display/intel_dpll_mgr.c
> diff --git a/drivers/gpu/drm/i915/intel_dpll_mgr.h b/drivers/gpu/drm/i915/display/intel_dpll_mgr.h
> similarity index 100%
> rename from drivers/gpu/drm/i915/intel_dpll_mgr.h
> rename to drivers/gpu/drm/i915/display/intel_dpll_mgr.h
> diff --git a/drivers/gpu/drm/i915/intel_fbc.c b/drivers/gpu/drm/i915/display/intel_fbc.c
> similarity index 100%
> rename from drivers/gpu/drm/i915/intel_fbc.c
> rename to drivers/gpu/drm/i915/display/intel_fbc.c
> diff --git a/drivers/gpu/drm/i915/intel_fbc.h b/drivers/gpu/drm/i915/display/intel_fbc.h
> similarity index 100%
> rename from drivers/gpu/drm/i915/intel_fbc.h
> rename to drivers/gpu/drm/i915/display/intel_fbc.h
> diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/display/intel_fbdev.c
> similarity index 100%
> rename from drivers/gpu/drm/i915/intel_fbdev.c
> rename to drivers/gpu/drm/i915/display/intel_fbdev.c
> diff --git a/drivers/gpu/drm/i915/intel_fbdev.h b/drivers/gpu/drm/i915/display/intel_fbdev.h
> similarity index 100%
> rename from drivers/gpu/drm/i915/intel_fbdev.h
> rename to drivers/gpu/drm/i915/display/intel_fbdev.h
> diff --git a/drivers/gpu/drm/i915/intel_fifo_underrun.c b/drivers/gpu/drm/i915/display/intel_fifo_underrun.c
> similarity index 100%
> rename from drivers/gpu/drm/i915/intel_fifo_underrun.c
> rename to drivers/gpu/drm/i915/display/intel_fifo_underrun.c
> diff --git a/drivers/gpu/drm/i915/intel_fifo_underrun.h b/drivers/gpu/drm/i915/display/intel_fifo_underrun.h
> similarity index 100%
> rename from drivers/gpu/drm/i915/intel_fifo_underrun.h
> rename to drivers/gpu/drm/i915/display/intel_fifo_underrun.h
> diff --git a/drivers/gpu/drm/i915/intel_frontbuffer.c b/drivers/gpu/drm/i915/display/intel_frontbuffer.c
> similarity index 100%
> rename from drivers/gpu/drm/i915/intel_frontbuffer.c
> rename to drivers/gpu/drm/i915/display/intel_frontbuffer.c
> diff --git a/drivers/gpu/drm/i915/intel_frontbuffer.h b/drivers/gpu/drm/i915/display/intel_frontbuffer.h
> similarity index 100%
> rename from drivers/gpu/drm/i915/intel_frontbuffer.h
> rename to drivers/gpu/drm/i915/display/intel_frontbuffer.h
> diff --git a/drivers/gpu/drm/i915/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c
> similarity index 100%
> rename from drivers/gpu/drm/i915/intel_hdcp.c
> rename to drivers/gpu/drm/i915/display/intel_hdcp.c
> diff --git a/drivers/gpu/drm/i915/intel_hdcp.h b/drivers/gpu/drm/i915/display/intel_hdcp.h
> similarity index 100%
> rename from drivers/gpu/drm/i915/intel_hdcp.h
> rename to drivers/gpu/drm/i915/display/intel_hdcp.h
> diff --git a/drivers/gpu/drm/i915/intel_hotplug.c b/drivers/gpu/drm/i915/display/intel_hotplug.c
> similarity index 100%
> rename from drivers/gpu/drm/i915/intel_hotplug.c
> rename to drivers/gpu/drm/i915/display/intel_hotplug.c
> diff --git a/drivers/gpu/drm/i915/intel_hotplug.h b/drivers/gpu/drm/i915/display/intel_hotplug.h
> similarity index 100%
> rename from drivers/gpu/drm/i915/intel_hotplug.h
> rename to drivers/gpu/drm/i915/display/intel_hotplug.h
> diff --git a/drivers/gpu/drm/i915/intel_lpe_audio.c b/drivers/gpu/drm/i915/display/intel_lpe_audio.c
> similarity index 100%
> rename from drivers/gpu/drm/i915/intel_lpe_audio.c
> rename to drivers/gpu/drm/i915/display/intel_lpe_audio.c
> diff --git a/drivers/gpu/drm/i915/intel_lpe_audio.h b/drivers/gpu/drm/i915/display/intel_lpe_audio.h
> similarity index 100%
> rename from drivers/gpu/drm/i915/intel_lpe_audio.h
> rename to drivers/gpu/drm/i915/display/intel_lpe_audio.h
> diff --git a/drivers/gpu/drm/i915/intel_opregion.c b/drivers/gpu/drm/i915/display/intel_opregion.c
> similarity index 100%
> rename from drivers/gpu/drm/i915/intel_opregion.c
> rename to drivers/gpu/drm/i915/display/intel_opregion.c
> diff --git a/drivers/gpu/drm/i915/intel_opregion.h b/drivers/gpu/drm/i915/display/intel_opregion.h
> similarity index 100%
> rename from drivers/gpu/drm/i915/intel_opregion.h
> rename to drivers/gpu/drm/i915/display/intel_opregion.h
> diff --git a/drivers/gpu/drm/i915/intel_overlay.c b/drivers/gpu/drm/i915/display/intel_overlay.c
> similarity index 100%
> rename from drivers/gpu/drm/i915/intel_overlay.c
> rename to drivers/gpu/drm/i915/display/intel_overlay.c
> diff --git a/drivers/gpu/drm/i915/intel_overlay.h b/drivers/gpu/drm/i915/display/intel_overlay.h
> similarity index 100%
> rename from drivers/gpu/drm/i915/intel_overlay.h
> rename to drivers/gpu/drm/i915/display/intel_overlay.h
> diff --git a/drivers/gpu/drm/i915/intel_pipe_crc.c b/drivers/gpu/drm/i915/display/intel_pipe_crc.c
> similarity index 100%
> rename from drivers/gpu/drm/i915/intel_pipe_crc.c
> rename to drivers/gpu/drm/i915/display/intel_pipe_crc.c
> diff --git a/drivers/gpu/drm/i915/intel_pipe_crc.h b/drivers/gpu/drm/i915/display/intel_pipe_crc.h
> similarity index 100%
> rename from drivers/gpu/drm/i915/intel_pipe_crc.h
> rename to drivers/gpu/drm/i915/display/intel_pipe_crc.h
> diff --git a/drivers/gpu/drm/i915/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c
> similarity index 100%
> rename from drivers/gpu/drm/i915/intel_psr.c
> rename to drivers/gpu/drm/i915/display/intel_psr.c
> diff --git a/drivers/gpu/drm/i915/intel_psr.h b/drivers/gpu/drm/i915/display/intel_psr.h
> similarity index 100%
> rename from drivers/gpu/drm/i915/intel_psr.h
> rename to drivers/gpu/drm/i915/display/intel_psr.h
> diff --git a/drivers/gpu/drm/i915/intel_quirks.c b/drivers/gpu/drm/i915/display/intel_quirks.c
> similarity index 100%
> rename from drivers/gpu/drm/i915/intel_quirks.c
> rename to drivers/gpu/drm/i915/display/intel_quirks.c
> diff --git a/drivers/gpu/drm/i915/intel_quirks.h b/drivers/gpu/drm/i915/display/intel_quirks.h
> similarity index 100%
> rename from drivers/gpu/drm/i915/intel_quirks.h
> rename to drivers/gpu/drm/i915/display/intel_quirks.h
> diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/display/intel_sprite.c
> similarity index 100%
> rename from drivers/gpu/drm/i915/intel_sprite.c
> rename to drivers/gpu/drm/i915/display/intel_sprite.c
> diff --git a/drivers/gpu/drm/i915/intel_sprite.h b/drivers/gpu/drm/i915/display/intel_sprite.h
> similarity index 100%
> rename from drivers/gpu/drm/i915/intel_sprite.h
> rename to drivers/gpu/drm/i915/display/intel_sprite.h
> diff --git a/drivers/gpu/drm/i915/intel_vbt_defs.h b/drivers/gpu/drm/i915/display/intel_vbt_defs.h
> similarity index 100%
> rename from drivers/gpu/drm/i915/intel_vbt_defs.h
> rename to drivers/gpu/drm/i915/display/intel_vbt_defs.h
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_clflush.c b/drivers/gpu/drm/i915/gem/i915_gem_clflush.c
> index 537aa2337cc8..9018e12b536b 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_clflush.c
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_clflush.c
> @@ -4,9 +4,10 @@
> * Copyright © 2016 Intel Corporation
> */
>
> +#include "display/intel_frontbuffer.h"
> +
> #include "i915_drv.h"
> #include "i915_gem_clflush.h"
> -#include "intel_frontbuffer.h"
>
> static DEFINE_SPINLOCK(clflush_lock);
>
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_domain.c b/drivers/gpu/drm/i915/gem/i915_gem_domain.c
> index bd180ef46aeb..2e3ce2a69653 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_domain.c
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_domain.c
> @@ -4,13 +4,14 @@
> * Copyright © 2014-2016 Intel Corporation
> */
>
> +#include "display/intel_frontbuffer.h"
> +
> #include "i915_drv.h"
> #include "i915_gem_clflush.h"
> #include "i915_gem_gtt.h"
> #include "i915_gem_ioctls.h"
> #include "i915_gem_object.h"
> #include "i915_vma.h"
> -#include "intel_frontbuffer.h"
>
> static void __i915_gem_object_flush_for_display(struct drm_i915_gem_object *obj)
> {
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
> index 528eea44dccf..5fae0e50aad0 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
> @@ -12,6 +12,8 @@
> #include <drm/drm_syncobj.h>
> #include <drm/i915_drm.h>
>
> +#include "display/intel_frontbuffer.h"
> +
> #include "gem/i915_gem_ioctls.h"
> #include "gt/intel_context.h"
> #include "gt/intel_gt_pm.h"
> @@ -21,7 +23,6 @@
> #include "i915_gem_context.h"
> #include "i915_trace.h"
> #include "intel_drv.h"
> -#include "intel_frontbuffer.h"
>
> enum {
> FORCE_CPU_RELOC = 1,
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object.c b/drivers/gpu/drm/i915/gem/i915_gem_object.c
> index 36b76c6a0a9d..ffd439904b08 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_object.c
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_object.c
> @@ -22,12 +22,13 @@
> *
> */
>
> +#include "display/intel_frontbuffer.h"
> +
> #include "i915_drv.h"
> #include "i915_gem_clflush.h"
> #include "i915_gem_context.h"
> #include "i915_gem_object.h"
> #include "i915_globals.h"
> -#include "intel_frontbuffer.h"
>
> static struct i915_global_object {
> struct i915_global base;
> diff --git a/drivers/gpu/drm/i915/gt/intel_reset.c b/drivers/gpu/drm/i915/gt/intel_reset.c
> index 6368b37f26d1..8ad6bbd12f63 100644
> --- a/drivers/gpu/drm/i915/gt/intel_reset.c
> +++ b/drivers/gpu/drm/i915/gt/intel_reset.c
> @@ -7,6 +7,8 @@
> #include <linux/sched/mm.h>
> #include <linux/stop_machine.h>
>
> +#include "display/intel_overlay.h"
> +
> #include "gem/i915_gem_context.h"
>
> #include "i915_drv.h"
> @@ -17,7 +19,6 @@
> #include "intel_reset.h"
>
> #include "intel_guc.h"
> -#include "intel_overlay.h"
>
> #define RESET_MAX_RETRIES 3
>
> diff --git a/drivers/gpu/drm/i915/gvt/opregion.c b/drivers/gpu/drm/i915/gvt/opregion.c
> index 276db53f1bf1..867e7629025b 100644
> --- a/drivers/gpu/drm/i915/gvt/opregion.c
> +++ b/drivers/gpu/drm/i915/gvt/opregion.c
> @@ -30,7 +30,7 @@
> * not do like this.
> */
> #define _INTEL_BIOS_PRIVATE
> -#include "intel_vbt_defs.h"
> +#include "display/intel_vbt_defs.h"
>
> #define OPREGION_SIGNATURE "IntelGraphicsMem"
> #define MBOX_VBT (1<<3)
> diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
> index b3425c7dc6bb..081595e58e5f 100644
> --- a/drivers/gpu/drm/i915/i915_debugfs.c
> +++ b/drivers/gpu/drm/i915/i915_debugfs.c
> @@ -33,7 +33,10 @@
> #include <drm/drm_fourcc.h>
>
> #include "display/intel_dp.h"
> +#include "display/intel_fbc.h"
> +#include "display/intel_hdcp.h"
> #include "display/intel_hdmi.h"
> +#include "display/intel_psr.h"
>
> #include "gem/i915_gem_context.h"
> #include "gt/intel_reset.h"
> @@ -42,11 +45,8 @@
> #include "i915_irq.h"
> #include "intel_csr.h"
> #include "intel_drv.h"
> -#include "intel_fbc.h"
> #include "intel_guc_submission.h"
> -#include "intel_hdcp.h"
> #include "intel_pm.h"
> -#include "intel_psr.h"
> #include "intel_sideband.h"
>
> static inline struct drm_i915_private *node_to_i915(struct drm_info_node *node)
> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> index 9b72387c4101..23a1e441bcf9 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -47,8 +47,17 @@
> #include <drm/drm_probe_helper.h>
> #include <drm/i915_drm.h>
>
> +#include "display/intel_acpi.h"
> +#include "display/intel_audio.h"
> +#include "display/intel_bw.h"
> +#include "display/intel_cdclk.h"
> #include "display/intel_dp.h"
> +#include "display/intel_fbdev.h"
> #include "display/intel_gmbus.h"
> +#include "display/intel_hotplug.h"
> +#include "display/intel_overlay.h"
> +#include "display/intel_pipe_crc.h"
> +#include "display/intel_sprite.h"
>
> #include "gem/i915_gem_context.h"
> #include "gem/i915_gem_ioctls.h"
> @@ -63,18 +72,9 @@
> #include "i915_query.h"
> #include "i915_trace.h"
> #include "i915_vgpu.h"
> -#include "intel_acpi.h"
> -#include "intel_audio.h"
> -#include "intel_bw.h"
> -#include "intel_cdclk.h"
> #include "intel_csr.h"
> #include "intel_drv.h"
> -#include "intel_fbdev.h"
> -#include "intel_hotplug.h"
> -#include "intel_overlay.h"
> -#include "intel_pipe_crc.h"
> #include "intel_pm.h"
> -#include "intel_sprite.h"
> #include "intel_uc.h"
>
> static struct drm_driver driver;
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index eb98d285d290..f2abdce68552 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -63,17 +63,18 @@
> #include "i915_reg.h"
> #include "i915_utils.h"
>
> +#include "display/intel_bios.h"
> +#include "display/intel_display.h"
> +#include "display/intel_display_power.h"
> +#include "display/intel_dpll_mgr.h"
> +#include "display/intel_frontbuffer.h"
> +#include "display/intel_opregion.h"
> +
> #include "gt/intel_lrc.h"
> #include "gt/intel_engine.h"
> #include "gt/intel_workarounds.h"
>
> -#include "intel_bios.h"
> #include "intel_device_info.h"
> -#include "intel_display.h"
> -#include "intel_display_power.h"
> -#include "intel_dpll_mgr.h"
> -#include "intel_frontbuffer.h"
> -#include "intel_opregion.h"
> #include "intel_runtime_pm.h"
> #include "intel_uc.h"
> #include "intel_uncore.h"
> diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
> index 4017ecf561f6..7092d0cd5d2b 100644
> --- a/drivers/gpu/drm/i915/i915_gem.c
> +++ b/drivers/gpu/drm/i915/i915_gem.c
> @@ -38,6 +38,9 @@
> #include <linux/dma-buf.h>
> #include <linux/mman.h>
>
> +#include "display/intel_display.h"
> +#include "display/intel_frontbuffer.h"
> +
> #include "gem/i915_gem_clflush.h"
> #include "gem/i915_gem_context.h"
> #include "gem/i915_gem_ioctls.h"
> @@ -54,9 +57,7 @@
> #include "i915_trace.h"
> #include "i915_vgpu.h"
>
> -#include "intel_display.h"
> #include "intel_drv.h"
> -#include "intel_frontbuffer.h"
> #include "intel_pm.h"
>
> static int
> diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
> index e70675bfb51d..edaf8f534d60 100644
> --- a/drivers/gpu/drm/i915/i915_gem_gtt.c
> +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
> @@ -35,12 +35,13 @@
>
> #include <drm/i915_drm.h>
>
> +#include "display/intel_frontbuffer.h"
> +
> #include "i915_drv.h"
> #include "i915_scatterlist.h"
> #include "i915_trace.h"
> #include "i915_vgpu.h"
> #include "intel_drv.h"
> -#include "intel_frontbuffer.h"
>
> #define I915_GFP_ALLOW_FAIL (GFP_KERNEL | __GFP_RETRY_MAYFAIL | __GFP_NOWARN)
>
> diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
> index d7f164c9f2eb..6dff91034043 100644
> --- a/drivers/gpu/drm/i915/i915_gpu_error.c
> +++ b/drivers/gpu/drm/i915/i915_gpu_error.c
> @@ -36,14 +36,15 @@
>
> #include <drm/drm_print.h>
>
> +#include "display/intel_atomic.h"
> +#include "display/intel_overlay.h"
> +
> #include "gem/i915_gem_context.h"
>
> #include "i915_drv.h"
> #include "i915_gpu_error.h"
> #include "i915_scatterlist.h"
> -#include "intel_atomic.h"
> #include "intel_csr.h"
> -#include "intel_overlay.h"
>
> static inline const struct intel_engine_cs *
> engine_lookup(const struct drm_i915_private *i915, unsigned int id)
> diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
> index cd9edddd6718..b7f6e3915562 100644
> --- a/drivers/gpu/drm/i915/i915_irq.c
> +++ b/drivers/gpu/drm/i915/i915_irq.c
> @@ -37,15 +37,16 @@
> #include <drm/drm_irq.h>
> #include <drm/i915_drm.h>
>
> +#include "display/intel_fifo_underrun.h"
> +#include "display/intel_hotplug.h"
> +#include "display/intel_lpe_audio.h"
> +#include "display/intel_psr.h"
> +
> #include "i915_drv.h"
> #include "i915_irq.h"
> #include "i915_trace.h"
> #include "intel_drv.h"
> -#include "intel_fifo_underrun.h"
> -#include "intel_hotplug.h"
> -#include "intel_lpe_audio.h"
> #include "intel_pm.h"
> -#include "intel_psr.h"
>
> /**
> * DOC: interrupt handling
> diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
> index 482f1d0f1770..6892c0c34f3c 100644
> --- a/drivers/gpu/drm/i915/i915_pci.c
> +++ b/drivers/gpu/drm/i915/i915_pci.c
> @@ -28,10 +28,11 @@
>
> #include <drm/drm_drv.h>
>
> +#include "display/intel_fbdev.h"
> +
> #include "i915_drv.h"
> #include "i915_globals.h"
> #include "i915_selftest.h"
> -#include "intel_fbdev.h"
>
> #define PLATFORM(x) .platform = (x)
> #define GEN(x) .gen = (x), .gen_mask = BIT((x) - 1)
> diff --git a/drivers/gpu/drm/i915/i915_suspend.c b/drivers/gpu/drm/i915/i915_suspend.c
> index 1e38a60a8ec7..a08d7d16621b 100644
> --- a/drivers/gpu/drm/i915/i915_suspend.c
> +++ b/drivers/gpu/drm/i915/i915_suspend.c
> @@ -26,11 +26,11 @@
>
> #include <drm/i915_drm.h>
>
> +#include "display/intel_fbc.h"
> #include "display/intel_gmbus.h"
>
> #include "i915_reg.h"
> #include "intel_drv.h"
> -#include "intel_fbc.h"
>
> static void i915_save_display(struct drm_i915_private *dev_priv)
> {
> diff --git a/drivers/gpu/drm/i915/i915_vma.c b/drivers/gpu/drm/i915/i915_vma.c
> index cb341e4acf99..e3ddaedeb3b1 100644
> --- a/drivers/gpu/drm/i915/i915_vma.c
> +++ b/drivers/gpu/drm/i915/i915_vma.c
> @@ -22,15 +22,15 @@
> *
> */
>
> -#include "gt/intel_engine.h"
> +#include <drm/drm_gem.h>
>
> -#include "i915_vma.h"
> +#include "display/intel_frontbuffer.h"
> +
> +#include "gt/intel_engine.h"
>
> #include "i915_drv.h"
> #include "i915_globals.h"
> -#include "intel_frontbuffer.h"
> -
> -#include <drm/drm_gem.h>
> +#include "i915_vma.h"
>
> static struct i915_global_vma {
> struct i915_global base;
> diff --git a/drivers/gpu/drm/i915/intel_device_info.h b/drivers/gpu/drm/i915/intel_device_info.h
> index 3ea953a230b3..b15b4b5e389f 100644
> --- a/drivers/gpu/drm/i915/intel_device_info.h
> +++ b/drivers/gpu/drm/i915/intel_device_info.h
> @@ -27,12 +27,12 @@
>
> #include <uapi/drm/i915_drm.h>
>
> +#include "display/intel_display.h"
> +
> #include "gt/intel_engine_types.h"
> #include "gt/intel_context_types.h"
> #include "gt/intel_sseu.h"
>
> -#include "intel_display.h"
> -
> struct drm_printer;
> struct drm_i915_private;
>
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index 2c7f3ebc0117..969fb8c208f0 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -33,13 +33,14 @@
> #include <drm/drm_fourcc.h>
> #include <drm/drm_plane_helper.h>
>
> +#include "display/intel_atomic.h"
> +#include "display/intel_fbc.h"
> +#include "display/intel_sprite.h"
> +
> #include "i915_drv.h"
> #include "i915_irq.h"
> -#include "intel_atomic.h"
> #include "intel_drv.h"
> -#include "intel_fbc.h"
> #include "intel_pm.h"
> -#include "intel_sprite.h"
> #include "intel_sideband.h"
> #include "../../../platform/x86/intel_ips.h"
>
> diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.h b/drivers/gpu/drm/i915/intel_runtime_pm.h
> index a7acceb13473..22cc1b0cbf83 100644
> --- a/drivers/gpu/drm/i915/intel_runtime_pm.h
> +++ b/drivers/gpu/drm/i915/intel_runtime_pm.h
> @@ -8,7 +8,8 @@
>
> #include <linux/types.h>
>
> -#include "intel_display.h"
> +#include "display/intel_display.h"
> +
> #include "intel_wakeref.h"
>
> struct drm_i915_private;
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PATCH v2 3/3] drm/i915: move modesetting core code under display/
2019-06-13 14:12 ` Maarten Lankhorst
@ 2019-06-17 8:58 ` Jani Nikula
0 siblings, 0 replies; 17+ messages in thread
From: Jani Nikula @ 2019-06-17 8:58 UTC (permalink / raw)
To: Maarten Lankhorst, intel-gfx
On Thu, 13 Jun 2019, Maarten Lankhorst <maarten.lankhorst@linux.intel.com> wrote:
> Op 13-06-2019 om 10:44 schreef Jani Nikula:
>> Now that we have a new subdirectory for display code, continue by moving
>> modesetting core code.
>>
>> display/intel_frontbuffer.h sticks out like a sore thumb, otherwise this
>> is, again, a surprisingly clean operation.
>>
>> v2:
>> - don't move intel_sideband.[ch] (Ville)
>> - use tabs for Makefile file lists and sort them
>>
>> Cc: Chris Wilson <chris@chris-wilson.co.uk>
>> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
>> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
>> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
>> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
>> Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>
> For whole series:
>
> Acked-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Pushed the series to dinq; thanks for the reviews and acks. We now have
display tucked away under a separate subdir.
BR,
Jani.
>
>> ---
>> drivers/gpu/drm/i915/Makefile | 66 ++++++++++---------
>> drivers/gpu/drm/i915/Makefile.header-test | 24 -------
>> .../gpu/drm/i915/display/Makefile.header-test | 2 +-
>> .../gpu/drm/i915/{ => display}/intel_acpi.c | 0
>> .../gpu/drm/i915/{ => display}/intel_acpi.h | 0
>> .../gpu/drm/i915/{ => display}/intel_atomic.c | 0
>> .../gpu/drm/i915/{ => display}/intel_atomic.h | 0
>> .../i915/{ => display}/intel_atomic_plane.c | 0
>> .../i915/{ => display}/intel_atomic_plane.h | 0
>> .../gpu/drm/i915/{ => display}/intel_audio.c | 0
>> .../gpu/drm/i915/{ => display}/intel_audio.h | 0
>> .../gpu/drm/i915/{ => display}/intel_bios.c | 0
>> .../gpu/drm/i915/{ => display}/intel_bios.h | 0
>> drivers/gpu/drm/i915/{ => display}/intel_bw.c | 0
>> drivers/gpu/drm/i915/{ => display}/intel_bw.h | 0
>> .../gpu/drm/i915/{ => display}/intel_cdclk.c | 0
>> .../gpu/drm/i915/{ => display}/intel_cdclk.h | 0
>> .../gpu/drm/i915/{ => display}/intel_color.c | 0
>> .../gpu/drm/i915/{ => display}/intel_color.h | 0
>> .../drm/i915/{ => display}/intel_combo_phy.c | 0
>> .../drm/i915/{ => display}/intel_combo_phy.h | 0
>> .../drm/i915/{ => display}/intel_connector.c | 0
>> .../drm/i915/{ => display}/intel_connector.h | 0
>> .../drm/i915/{ => display}/intel_display.c | 0
>> .../drm/i915/{ => display}/intel_display.h | 0
>> .../i915/{ => display}/intel_display_power.c | 0
>> .../i915/{ => display}/intel_display_power.h | 0
>> .../drm/i915/{ => display}/intel_dpio_phy.c | 0
>> .../drm/i915/{ => display}/intel_dpio_phy.h | 0
>> .../drm/i915/{ => display}/intel_dpll_mgr.c | 0
>> .../drm/i915/{ => display}/intel_dpll_mgr.h | 0
>> .../gpu/drm/i915/{ => display}/intel_fbc.c | 0
>> .../gpu/drm/i915/{ => display}/intel_fbc.h | 0
>> .../gpu/drm/i915/{ => display}/intel_fbdev.c | 0
>> .../gpu/drm/i915/{ => display}/intel_fbdev.h | 0
>> .../i915/{ => display}/intel_fifo_underrun.c | 0
>> .../i915/{ => display}/intel_fifo_underrun.h | 0
>> .../i915/{ => display}/intel_frontbuffer.c | 0
>> .../i915/{ => display}/intel_frontbuffer.h | 0
>> .../gpu/drm/i915/{ => display}/intel_hdcp.c | 0
>> .../gpu/drm/i915/{ => display}/intel_hdcp.h | 0
>> .../drm/i915/{ => display}/intel_hotplug.c | 0
>> .../drm/i915/{ => display}/intel_hotplug.h | 0
>> .../drm/i915/{ => display}/intel_lpe_audio.c | 0
>> .../drm/i915/{ => display}/intel_lpe_audio.h | 0
>> .../drm/i915/{ => display}/intel_opregion.c | 0
>> .../drm/i915/{ => display}/intel_opregion.h | 0
>> .../drm/i915/{ => display}/intel_overlay.c | 0
>> .../drm/i915/{ => display}/intel_overlay.h | 0
>> .../drm/i915/{ => display}/intel_pipe_crc.c | 0
>> .../drm/i915/{ => display}/intel_pipe_crc.h | 0
>> .../gpu/drm/i915/{ => display}/intel_psr.c | 0
>> .../gpu/drm/i915/{ => display}/intel_psr.h | 0
>> .../gpu/drm/i915/{ => display}/intel_quirks.c | 0
>> .../gpu/drm/i915/{ => display}/intel_quirks.h | 0
>> .../gpu/drm/i915/{ => display}/intel_sprite.c | 0
>> .../gpu/drm/i915/{ => display}/intel_sprite.h | 0
>> .../drm/i915/{ => display}/intel_vbt_defs.h | 0
>> drivers/gpu/drm/i915/gem/i915_gem_clflush.c | 3 +-
>> drivers/gpu/drm/i915/gem/i915_gem_domain.c | 3 +-
>> .../gpu/drm/i915/gem/i915_gem_execbuffer.c | 3 +-
>> drivers/gpu/drm/i915/gem/i915_gem_object.c | 3 +-
>> drivers/gpu/drm/i915/gt/intel_reset.c | 3 +-
>> drivers/gpu/drm/i915/gvt/opregion.c | 2 +-
>> drivers/gpu/drm/i915/i915_debugfs.c | 6 +-
>> drivers/gpu/drm/i915/i915_drv.c | 18 ++---
>> drivers/gpu/drm/i915/i915_drv.h | 13 ++--
>> drivers/gpu/drm/i915/i915_gem.c | 5 +-
>> drivers/gpu/drm/i915/i915_gem_gtt.c | 3 +-
>> drivers/gpu/drm/i915/i915_gpu_error.c | 5 +-
>> drivers/gpu/drm/i915/i915_irq.c | 9 +--
>> drivers/gpu/drm/i915/i915_pci.c | 3 +-
>> drivers/gpu/drm/i915/i915_suspend.c | 2 +-
>> drivers/gpu/drm/i915/i915_vma.c | 10 +--
>> drivers/gpu/drm/i915/intel_device_info.h | 4 +-
>> drivers/gpu/drm/i915/intel_pm.c | 7 +-
>> drivers/gpu/drm/i915/intel_runtime_pm.h | 3 +-
>> 77 files changed, 94 insertions(+), 103 deletions(-)
>> rename drivers/gpu/drm/i915/{ => display}/intel_acpi.c (100%)
>> rename drivers/gpu/drm/i915/{ => display}/intel_acpi.h (100%)
>> rename drivers/gpu/drm/i915/{ => display}/intel_atomic.c (100%)
>> rename drivers/gpu/drm/i915/{ => display}/intel_atomic.h (100%)
>> rename drivers/gpu/drm/i915/{ => display}/intel_atomic_plane.c (100%)
>> rename drivers/gpu/drm/i915/{ => display}/intel_atomic_plane.h (100%)
>> rename drivers/gpu/drm/i915/{ => display}/intel_audio.c (100%)
>> rename drivers/gpu/drm/i915/{ => display}/intel_audio.h (100%)
>> rename drivers/gpu/drm/i915/{ => display}/intel_bios.c (100%)
>> rename drivers/gpu/drm/i915/{ => display}/intel_bios.h (100%)
>> rename drivers/gpu/drm/i915/{ => display}/intel_bw.c (100%)
>> rename drivers/gpu/drm/i915/{ => display}/intel_bw.h (100%)
>> rename drivers/gpu/drm/i915/{ => display}/intel_cdclk.c (100%)
>> rename drivers/gpu/drm/i915/{ => display}/intel_cdclk.h (100%)
>> rename drivers/gpu/drm/i915/{ => display}/intel_color.c (100%)
>> rename drivers/gpu/drm/i915/{ => display}/intel_color.h (100%)
>> rename drivers/gpu/drm/i915/{ => display}/intel_combo_phy.c (100%)
>> rename drivers/gpu/drm/i915/{ => display}/intel_combo_phy.h (100%)
>> rename drivers/gpu/drm/i915/{ => display}/intel_connector.c (100%)
>> rename drivers/gpu/drm/i915/{ => display}/intel_connector.h (100%)
>> rename drivers/gpu/drm/i915/{ => display}/intel_display.c (100%)
>> rename drivers/gpu/drm/i915/{ => display}/intel_display.h (100%)
>> rename drivers/gpu/drm/i915/{ => display}/intel_display_power.c (100%)
>> rename drivers/gpu/drm/i915/{ => display}/intel_display_power.h (100%)
>> rename drivers/gpu/drm/i915/{ => display}/intel_dpio_phy.c (100%)
>> rename drivers/gpu/drm/i915/{ => display}/intel_dpio_phy.h (100%)
>> rename drivers/gpu/drm/i915/{ => display}/intel_dpll_mgr.c (100%)
>> rename drivers/gpu/drm/i915/{ => display}/intel_dpll_mgr.h (100%)
>> rename drivers/gpu/drm/i915/{ => display}/intel_fbc.c (100%)
>> rename drivers/gpu/drm/i915/{ => display}/intel_fbc.h (100%)
>> rename drivers/gpu/drm/i915/{ => display}/intel_fbdev.c (100%)
>> rename drivers/gpu/drm/i915/{ => display}/intel_fbdev.h (100%)
>> rename drivers/gpu/drm/i915/{ => display}/intel_fifo_underrun.c (100%)
>> rename drivers/gpu/drm/i915/{ => display}/intel_fifo_underrun.h (100%)
>> rename drivers/gpu/drm/i915/{ => display}/intel_frontbuffer.c (100%)
>> rename drivers/gpu/drm/i915/{ => display}/intel_frontbuffer.h (100%)
>> rename drivers/gpu/drm/i915/{ => display}/intel_hdcp.c (100%)
>> rename drivers/gpu/drm/i915/{ => display}/intel_hdcp.h (100%)
>> rename drivers/gpu/drm/i915/{ => display}/intel_hotplug.c (100%)
>> rename drivers/gpu/drm/i915/{ => display}/intel_hotplug.h (100%)
>> rename drivers/gpu/drm/i915/{ => display}/intel_lpe_audio.c (100%)
>> rename drivers/gpu/drm/i915/{ => display}/intel_lpe_audio.h (100%)
>> rename drivers/gpu/drm/i915/{ => display}/intel_opregion.c (100%)
>> rename drivers/gpu/drm/i915/{ => display}/intel_opregion.h (100%)
>> rename drivers/gpu/drm/i915/{ => display}/intel_overlay.c (100%)
>> rename drivers/gpu/drm/i915/{ => display}/intel_overlay.h (100%)
>> rename drivers/gpu/drm/i915/{ => display}/intel_pipe_crc.c (100%)
>> rename drivers/gpu/drm/i915/{ => display}/intel_pipe_crc.h (100%)
>> rename drivers/gpu/drm/i915/{ => display}/intel_psr.c (100%)
>> rename drivers/gpu/drm/i915/{ => display}/intel_psr.h (100%)
>> rename drivers/gpu/drm/i915/{ => display}/intel_quirks.c (100%)
>> rename drivers/gpu/drm/i915/{ => display}/intel_quirks.h (100%)
>> rename drivers/gpu/drm/i915/{ => display}/intel_sprite.c (100%)
>> rename drivers/gpu/drm/i915/{ => display}/intel_sprite.h (100%)
>> rename drivers/gpu/drm/i915/{ => display}/intel_vbt_defs.h (100%)
>>
>> diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
>> index 649f286887b7..91355c2ea8a5 100644
>> --- a/drivers/gpu/drm/i915/Makefile
>> +++ b/drivers/gpu/drm/i915/Makefile
>> @@ -51,8 +51,9 @@ i915-y += i915_drv.o \
>> intel_device_info.o \
>> intel_pm.o \
>> intel_runtime_pm.o \
>> - intel_wakeref.o \
>> - intel_uncore.o
>> + intel_sideband.o \
>> + intel_uncore.o \
>> + intel_wakeref.o
>>
>> # core library code
>> i915-y += \
>> @@ -63,7 +64,7 @@ i915-y += \
>> i915_user_extensions.o
>>
>> i915-$(CONFIG_COMPAT) += i915_ioc32.o
>> -i915-$(CONFIG_DEBUG_FS) += i915_debugfs.o intel_pipe_crc.o
>> +i915-$(CONFIG_DEBUG_FS) += i915_debugfs.o display/intel_pipe_crc.o
>> i915-$(CONFIG_PERF_EVENTS) += i915_pmu.o
>>
>> # "Graphics Technology" (aka we talk to the gpu)
>> @@ -149,34 +150,38 @@ i915-y += intel_renderstate_gen6.o \
>> intel_renderstate_gen9.o
>>
>> # modesetting core code
>> -i915-y += intel_audio.o \
>> - intel_atomic.o \
>> - intel_atomic_plane.o \
>> - intel_bios.o \
>> - intel_bw.o \
>> - intel_cdclk.o \
>> - intel_color.o \
>> - intel_combo_phy.o \
>> - intel_connector.o \
>> - intel_display.o \
>> - intel_display_power.o \
>> - intel_dpio_phy.o \
>> - intel_dpll_mgr.o \
>> - intel_fbc.o \
>> - intel_fifo_underrun.o \
>> - intel_frontbuffer.o \
>> - intel_hdcp.o \
>> - intel_hotplug.o \
>> - intel_overlay.o \
>> - intel_psr.o \
>> - intel_quirks.o \
>> - intel_sideband.o \
>> - intel_sprite.o
>> -i915-$(CONFIG_ACPI) += intel_acpi.o intel_opregion.o
>> -i915-$(CONFIG_DRM_FBDEV_EMULATION) += intel_fbdev.o
>> +obj-y += display/
>> +i915-y += \
>> + display/intel_atomic.o \
>> + display/intel_atomic_plane.o \
>> + display/intel_audio.o \
>> + display/intel_bios.o \
>> + display/intel_bw.o \
>> + display/intel_cdclk.o \
>> + display/intel_color.o \
>> + display/intel_combo_phy.o \
>> + display/intel_connector.o \
>> + display/intel_display.o \
>> + display/intel_display_power.o \
>> + display/intel_dpio_phy.o \
>> + display/intel_dpll_mgr.o \
>> + display/intel_fbc.o \
>> + display/intel_fifo_underrun.o \
>> + display/intel_frontbuffer.o \
>> + display/intel_hdcp.o \
>> + display/intel_hotplug.o \
>> + display/intel_lpe_audio.o \
>> + display/intel_overlay.o \
>> + display/intel_psr.o \
>> + display/intel_quirks.o \
>> + display/intel_sprite.o
>> +i915-$(CONFIG_ACPI) += \
>> + display/intel_acpi.o \
>> + display/intel_opregion.o
>> +i915-$(CONFIG_DRM_FBDEV_EMULATION) += \
>> + display/intel_fbdev.o
>>
>> # modesetting output/encoder code
>> -obj-y += display/
>> i915-y += \
>> display/dvo_ch7017.o \
>> display/dvo_ch7xxx.o \
>> @@ -242,8 +247,5 @@ i915-y += intel_gvt.o
>> include $(src)/gvt/Makefile
>> endif
>>
>> -# LPE Audio for VLV and CHT
>> -i915-y += intel_lpe_audio.o
>> -
>> obj-$(CONFIG_DRM_I915) += i915.o
>> obj-$(CONFIG_DRM_I915_GVT_KVMGT) += gvt/kvmgt.o
>> diff --git a/drivers/gpu/drm/i915/Makefile.header-test b/drivers/gpu/drm/i915/Makefile.header-test
>> index 5a04858c9b7b..e6ba66f787f9 100644
>> --- a/drivers/gpu/drm/i915/Makefile.header-test
>> +++ b/drivers/gpu/drm/i915/Makefile.header-test
>> @@ -13,35 +13,11 @@ header_test := \
>> i915_scheduler_types.h \
>> i915_timeline_types.h \
>> i915_utils.h \
>> - intel_acpi.h \
>> - intel_atomic.h \
>> - intel_atomic_plane.h \
>> - intel_audio.h \
>> - intel_bios.h \
>> - intel_cdclk.h \
>> - intel_color.h \
>> - intel_combo_phy.h \
>> - intel_connector.h \
>> intel_csr.h \
>> - intel_display_power.h \
>> - intel_dpio_phy.h \
>> - intel_dpll_mgr.h \
>> intel_drv.h \
>> - intel_fbc.h \
>> - intel_fbdev.h \
>> - intel_fifo_underrun.h \
>> - intel_frontbuffer.h \
>> - intel_hdcp.h \
>> - intel_hotplug.h \
>> - intel_lpe_audio.h \
>> - intel_overlay.h \
>> - intel_pipe_crc.h \
>> intel_pm.h \
>> - intel_psr.h \
>> - intel_quirks.h \
>> intel_runtime_pm.h \
>> intel_sideband.h \
>> - intel_sprite.h \
>> intel_uncore.h \
>> intel_wakeref.h
>>
>> diff --git a/drivers/gpu/drm/i915/display/Makefile.header-test b/drivers/gpu/drm/i915/display/Makefile.header-test
>> index 61e06cbb4b32..fc7d4e5bd2c6 100644
>> --- a/drivers/gpu/drm/i915/display/Makefile.header-test
>> +++ b/drivers/gpu/drm/i915/display/Makefile.header-test
>> @@ -2,7 +2,7 @@
>> # Copyright © 2019 Intel Corporation
>>
>> # Test the headers are compilable as standalone units
>> -header_test := $(notdir $(wildcard $(src)/*.h))
>> +header_test := $(notdir $(filter-out %/intel_vbt_defs.h,$(wildcard $(src)/*.h)))
>>
>> quiet_cmd_header_test = HDRTEST $@
>> cmd_header_test = echo "\#include \"$(<F)\"" > $@
>> diff --git a/drivers/gpu/drm/i915/intel_acpi.c b/drivers/gpu/drm/i915/display/intel_acpi.c
>> similarity index 100%
>> rename from drivers/gpu/drm/i915/intel_acpi.c
>> rename to drivers/gpu/drm/i915/display/intel_acpi.c
>> diff --git a/drivers/gpu/drm/i915/intel_acpi.h b/drivers/gpu/drm/i915/display/intel_acpi.h
>> similarity index 100%
>> rename from drivers/gpu/drm/i915/intel_acpi.h
>> rename to drivers/gpu/drm/i915/display/intel_acpi.h
>> diff --git a/drivers/gpu/drm/i915/intel_atomic.c b/drivers/gpu/drm/i915/display/intel_atomic.c
>> similarity index 100%
>> rename from drivers/gpu/drm/i915/intel_atomic.c
>> rename to drivers/gpu/drm/i915/display/intel_atomic.c
>> diff --git a/drivers/gpu/drm/i915/intel_atomic.h b/drivers/gpu/drm/i915/display/intel_atomic.h
>> similarity index 100%
>> rename from drivers/gpu/drm/i915/intel_atomic.h
>> rename to drivers/gpu/drm/i915/display/intel_atomic.h
>> diff --git a/drivers/gpu/drm/i915/intel_atomic_plane.c b/drivers/gpu/drm/i915/display/intel_atomic_plane.c
>> similarity index 100%
>> rename from drivers/gpu/drm/i915/intel_atomic_plane.c
>> rename to drivers/gpu/drm/i915/display/intel_atomic_plane.c
>> diff --git a/drivers/gpu/drm/i915/intel_atomic_plane.h b/drivers/gpu/drm/i915/display/intel_atomic_plane.h
>> similarity index 100%
>> rename from drivers/gpu/drm/i915/intel_atomic_plane.h
>> rename to drivers/gpu/drm/i915/display/intel_atomic_plane.h
>> diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/display/intel_audio.c
>> similarity index 100%
>> rename from drivers/gpu/drm/i915/intel_audio.c
>> rename to drivers/gpu/drm/i915/display/intel_audio.c
>> diff --git a/drivers/gpu/drm/i915/intel_audio.h b/drivers/gpu/drm/i915/display/intel_audio.h
>> similarity index 100%
>> rename from drivers/gpu/drm/i915/intel_audio.h
>> rename to drivers/gpu/drm/i915/display/intel_audio.h
>> diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c
>> similarity index 100%
>> rename from drivers/gpu/drm/i915/intel_bios.c
>> rename to drivers/gpu/drm/i915/display/intel_bios.c
>> diff --git a/drivers/gpu/drm/i915/intel_bios.h b/drivers/gpu/drm/i915/display/intel_bios.h
>> similarity index 100%
>> rename from drivers/gpu/drm/i915/intel_bios.h
>> rename to drivers/gpu/drm/i915/display/intel_bios.h
>> diff --git a/drivers/gpu/drm/i915/intel_bw.c b/drivers/gpu/drm/i915/display/intel_bw.c
>> similarity index 100%
>> rename from drivers/gpu/drm/i915/intel_bw.c
>> rename to drivers/gpu/drm/i915/display/intel_bw.c
>> diff --git a/drivers/gpu/drm/i915/intel_bw.h b/drivers/gpu/drm/i915/display/intel_bw.h
>> similarity index 100%
>> rename from drivers/gpu/drm/i915/intel_bw.h
>> rename to drivers/gpu/drm/i915/display/intel_bw.h
>> diff --git a/drivers/gpu/drm/i915/intel_cdclk.c b/drivers/gpu/drm/i915/display/intel_cdclk.c
>> similarity index 100%
>> rename from drivers/gpu/drm/i915/intel_cdclk.c
>> rename to drivers/gpu/drm/i915/display/intel_cdclk.c
>> diff --git a/drivers/gpu/drm/i915/intel_cdclk.h b/drivers/gpu/drm/i915/display/intel_cdclk.h
>> similarity index 100%
>> rename from drivers/gpu/drm/i915/intel_cdclk.h
>> rename to drivers/gpu/drm/i915/display/intel_cdclk.h
>> diff --git a/drivers/gpu/drm/i915/intel_color.c b/drivers/gpu/drm/i915/display/intel_color.c
>> similarity index 100%
>> rename from drivers/gpu/drm/i915/intel_color.c
>> rename to drivers/gpu/drm/i915/display/intel_color.c
>> diff --git a/drivers/gpu/drm/i915/intel_color.h b/drivers/gpu/drm/i915/display/intel_color.h
>> similarity index 100%
>> rename from drivers/gpu/drm/i915/intel_color.h
>> rename to drivers/gpu/drm/i915/display/intel_color.h
>> diff --git a/drivers/gpu/drm/i915/intel_combo_phy.c b/drivers/gpu/drm/i915/display/intel_combo_phy.c
>> similarity index 100%
>> rename from drivers/gpu/drm/i915/intel_combo_phy.c
>> rename to drivers/gpu/drm/i915/display/intel_combo_phy.c
>> diff --git a/drivers/gpu/drm/i915/intel_combo_phy.h b/drivers/gpu/drm/i915/display/intel_combo_phy.h
>> similarity index 100%
>> rename from drivers/gpu/drm/i915/intel_combo_phy.h
>> rename to drivers/gpu/drm/i915/display/intel_combo_phy.h
>> diff --git a/drivers/gpu/drm/i915/intel_connector.c b/drivers/gpu/drm/i915/display/intel_connector.c
>> similarity index 100%
>> rename from drivers/gpu/drm/i915/intel_connector.c
>> rename to drivers/gpu/drm/i915/display/intel_connector.c
>> diff --git a/drivers/gpu/drm/i915/intel_connector.h b/drivers/gpu/drm/i915/display/intel_connector.h
>> similarity index 100%
>> rename from drivers/gpu/drm/i915/intel_connector.h
>> rename to drivers/gpu/drm/i915/display/intel_connector.h
>> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
>> similarity index 100%
>> rename from drivers/gpu/drm/i915/intel_display.c
>> rename to drivers/gpu/drm/i915/display/intel_display.c
>> diff --git a/drivers/gpu/drm/i915/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h
>> similarity index 100%
>> rename from drivers/gpu/drm/i915/intel_display.h
>> rename to drivers/gpu/drm/i915/display/intel_display.h
>> diff --git a/drivers/gpu/drm/i915/intel_display_power.c b/drivers/gpu/drm/i915/display/intel_display_power.c
>> similarity index 100%
>> rename from drivers/gpu/drm/i915/intel_display_power.c
>> rename to drivers/gpu/drm/i915/display/intel_display_power.c
>> diff --git a/drivers/gpu/drm/i915/intel_display_power.h b/drivers/gpu/drm/i915/display/intel_display_power.h
>> similarity index 100%
>> rename from drivers/gpu/drm/i915/intel_display_power.h
>> rename to drivers/gpu/drm/i915/display/intel_display_power.h
>> diff --git a/drivers/gpu/drm/i915/intel_dpio_phy.c b/drivers/gpu/drm/i915/display/intel_dpio_phy.c
>> similarity index 100%
>> rename from drivers/gpu/drm/i915/intel_dpio_phy.c
>> rename to drivers/gpu/drm/i915/display/intel_dpio_phy.c
>> diff --git a/drivers/gpu/drm/i915/intel_dpio_phy.h b/drivers/gpu/drm/i915/display/intel_dpio_phy.h
>> similarity index 100%
>> rename from drivers/gpu/drm/i915/intel_dpio_phy.h
>> rename to drivers/gpu/drm/i915/display/intel_dpio_phy.h
>> diff --git a/drivers/gpu/drm/i915/intel_dpll_mgr.c b/drivers/gpu/drm/i915/display/intel_dpll_mgr.c
>> similarity index 100%
>> rename from drivers/gpu/drm/i915/intel_dpll_mgr.c
>> rename to drivers/gpu/drm/i915/display/intel_dpll_mgr.c
>> diff --git a/drivers/gpu/drm/i915/intel_dpll_mgr.h b/drivers/gpu/drm/i915/display/intel_dpll_mgr.h
>> similarity index 100%
>> rename from drivers/gpu/drm/i915/intel_dpll_mgr.h
>> rename to drivers/gpu/drm/i915/display/intel_dpll_mgr.h
>> diff --git a/drivers/gpu/drm/i915/intel_fbc.c b/drivers/gpu/drm/i915/display/intel_fbc.c
>> similarity index 100%
>> rename from drivers/gpu/drm/i915/intel_fbc.c
>> rename to drivers/gpu/drm/i915/display/intel_fbc.c
>> diff --git a/drivers/gpu/drm/i915/intel_fbc.h b/drivers/gpu/drm/i915/display/intel_fbc.h
>> similarity index 100%
>> rename from drivers/gpu/drm/i915/intel_fbc.h
>> rename to drivers/gpu/drm/i915/display/intel_fbc.h
>> diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/display/intel_fbdev.c
>> similarity index 100%
>> rename from drivers/gpu/drm/i915/intel_fbdev.c
>> rename to drivers/gpu/drm/i915/display/intel_fbdev.c
>> diff --git a/drivers/gpu/drm/i915/intel_fbdev.h b/drivers/gpu/drm/i915/display/intel_fbdev.h
>> similarity index 100%
>> rename from drivers/gpu/drm/i915/intel_fbdev.h
>> rename to drivers/gpu/drm/i915/display/intel_fbdev.h
>> diff --git a/drivers/gpu/drm/i915/intel_fifo_underrun.c b/drivers/gpu/drm/i915/display/intel_fifo_underrun.c
>> similarity index 100%
>> rename from drivers/gpu/drm/i915/intel_fifo_underrun.c
>> rename to drivers/gpu/drm/i915/display/intel_fifo_underrun.c
>> diff --git a/drivers/gpu/drm/i915/intel_fifo_underrun.h b/drivers/gpu/drm/i915/display/intel_fifo_underrun.h
>> similarity index 100%
>> rename from drivers/gpu/drm/i915/intel_fifo_underrun.h
>> rename to drivers/gpu/drm/i915/display/intel_fifo_underrun.h
>> diff --git a/drivers/gpu/drm/i915/intel_frontbuffer.c b/drivers/gpu/drm/i915/display/intel_frontbuffer.c
>> similarity index 100%
>> rename from drivers/gpu/drm/i915/intel_frontbuffer.c
>> rename to drivers/gpu/drm/i915/display/intel_frontbuffer.c
>> diff --git a/drivers/gpu/drm/i915/intel_frontbuffer.h b/drivers/gpu/drm/i915/display/intel_frontbuffer.h
>> similarity index 100%
>> rename from drivers/gpu/drm/i915/intel_frontbuffer.h
>> rename to drivers/gpu/drm/i915/display/intel_frontbuffer.h
>> diff --git a/drivers/gpu/drm/i915/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c
>> similarity index 100%
>> rename from drivers/gpu/drm/i915/intel_hdcp.c
>> rename to drivers/gpu/drm/i915/display/intel_hdcp.c
>> diff --git a/drivers/gpu/drm/i915/intel_hdcp.h b/drivers/gpu/drm/i915/display/intel_hdcp.h
>> similarity index 100%
>> rename from drivers/gpu/drm/i915/intel_hdcp.h
>> rename to drivers/gpu/drm/i915/display/intel_hdcp.h
>> diff --git a/drivers/gpu/drm/i915/intel_hotplug.c b/drivers/gpu/drm/i915/display/intel_hotplug.c
>> similarity index 100%
>> rename from drivers/gpu/drm/i915/intel_hotplug.c
>> rename to drivers/gpu/drm/i915/display/intel_hotplug.c
>> diff --git a/drivers/gpu/drm/i915/intel_hotplug.h b/drivers/gpu/drm/i915/display/intel_hotplug.h
>> similarity index 100%
>> rename from drivers/gpu/drm/i915/intel_hotplug.h
>> rename to drivers/gpu/drm/i915/display/intel_hotplug.h
>> diff --git a/drivers/gpu/drm/i915/intel_lpe_audio.c b/drivers/gpu/drm/i915/display/intel_lpe_audio.c
>> similarity index 100%
>> rename from drivers/gpu/drm/i915/intel_lpe_audio.c
>> rename to drivers/gpu/drm/i915/display/intel_lpe_audio.c
>> diff --git a/drivers/gpu/drm/i915/intel_lpe_audio.h b/drivers/gpu/drm/i915/display/intel_lpe_audio.h
>> similarity index 100%
>> rename from drivers/gpu/drm/i915/intel_lpe_audio.h
>> rename to drivers/gpu/drm/i915/display/intel_lpe_audio.h
>> diff --git a/drivers/gpu/drm/i915/intel_opregion.c b/drivers/gpu/drm/i915/display/intel_opregion.c
>> similarity index 100%
>> rename from drivers/gpu/drm/i915/intel_opregion.c
>> rename to drivers/gpu/drm/i915/display/intel_opregion.c
>> diff --git a/drivers/gpu/drm/i915/intel_opregion.h b/drivers/gpu/drm/i915/display/intel_opregion.h
>> similarity index 100%
>> rename from drivers/gpu/drm/i915/intel_opregion.h
>> rename to drivers/gpu/drm/i915/display/intel_opregion.h
>> diff --git a/drivers/gpu/drm/i915/intel_overlay.c b/drivers/gpu/drm/i915/display/intel_overlay.c
>> similarity index 100%
>> rename from drivers/gpu/drm/i915/intel_overlay.c
>> rename to drivers/gpu/drm/i915/display/intel_overlay.c
>> diff --git a/drivers/gpu/drm/i915/intel_overlay.h b/drivers/gpu/drm/i915/display/intel_overlay.h
>> similarity index 100%
>> rename from drivers/gpu/drm/i915/intel_overlay.h
>> rename to drivers/gpu/drm/i915/display/intel_overlay.h
>> diff --git a/drivers/gpu/drm/i915/intel_pipe_crc.c b/drivers/gpu/drm/i915/display/intel_pipe_crc.c
>> similarity index 100%
>> rename from drivers/gpu/drm/i915/intel_pipe_crc.c
>> rename to drivers/gpu/drm/i915/display/intel_pipe_crc.c
>> diff --git a/drivers/gpu/drm/i915/intel_pipe_crc.h b/drivers/gpu/drm/i915/display/intel_pipe_crc.h
>> similarity index 100%
>> rename from drivers/gpu/drm/i915/intel_pipe_crc.h
>> rename to drivers/gpu/drm/i915/display/intel_pipe_crc.h
>> diff --git a/drivers/gpu/drm/i915/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c
>> similarity index 100%
>> rename from drivers/gpu/drm/i915/intel_psr.c
>> rename to drivers/gpu/drm/i915/display/intel_psr.c
>> diff --git a/drivers/gpu/drm/i915/intel_psr.h b/drivers/gpu/drm/i915/display/intel_psr.h
>> similarity index 100%
>> rename from drivers/gpu/drm/i915/intel_psr.h
>> rename to drivers/gpu/drm/i915/display/intel_psr.h
>> diff --git a/drivers/gpu/drm/i915/intel_quirks.c b/drivers/gpu/drm/i915/display/intel_quirks.c
>> similarity index 100%
>> rename from drivers/gpu/drm/i915/intel_quirks.c
>> rename to drivers/gpu/drm/i915/display/intel_quirks.c
>> diff --git a/drivers/gpu/drm/i915/intel_quirks.h b/drivers/gpu/drm/i915/display/intel_quirks.h
>> similarity index 100%
>> rename from drivers/gpu/drm/i915/intel_quirks.h
>> rename to drivers/gpu/drm/i915/display/intel_quirks.h
>> diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/display/intel_sprite.c
>> similarity index 100%
>> rename from drivers/gpu/drm/i915/intel_sprite.c
>> rename to drivers/gpu/drm/i915/display/intel_sprite.c
>> diff --git a/drivers/gpu/drm/i915/intel_sprite.h b/drivers/gpu/drm/i915/display/intel_sprite.h
>> similarity index 100%
>> rename from drivers/gpu/drm/i915/intel_sprite.h
>> rename to drivers/gpu/drm/i915/display/intel_sprite.h
>> diff --git a/drivers/gpu/drm/i915/intel_vbt_defs.h b/drivers/gpu/drm/i915/display/intel_vbt_defs.h
>> similarity index 100%
>> rename from drivers/gpu/drm/i915/intel_vbt_defs.h
>> rename to drivers/gpu/drm/i915/display/intel_vbt_defs.h
>> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_clflush.c b/drivers/gpu/drm/i915/gem/i915_gem_clflush.c
>> index 537aa2337cc8..9018e12b536b 100644
>> --- a/drivers/gpu/drm/i915/gem/i915_gem_clflush.c
>> +++ b/drivers/gpu/drm/i915/gem/i915_gem_clflush.c
>> @@ -4,9 +4,10 @@
>> * Copyright © 2016 Intel Corporation
>> */
>>
>> +#include "display/intel_frontbuffer.h"
>> +
>> #include "i915_drv.h"
>> #include "i915_gem_clflush.h"
>> -#include "intel_frontbuffer.h"
>>
>> static DEFINE_SPINLOCK(clflush_lock);
>>
>> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_domain.c b/drivers/gpu/drm/i915/gem/i915_gem_domain.c
>> index bd180ef46aeb..2e3ce2a69653 100644
>> --- a/drivers/gpu/drm/i915/gem/i915_gem_domain.c
>> +++ b/drivers/gpu/drm/i915/gem/i915_gem_domain.c
>> @@ -4,13 +4,14 @@
>> * Copyright © 2014-2016 Intel Corporation
>> */
>>
>> +#include "display/intel_frontbuffer.h"
>> +
>> #include "i915_drv.h"
>> #include "i915_gem_clflush.h"
>> #include "i915_gem_gtt.h"
>> #include "i915_gem_ioctls.h"
>> #include "i915_gem_object.h"
>> #include "i915_vma.h"
>> -#include "intel_frontbuffer.h"
>>
>> static void __i915_gem_object_flush_for_display(struct drm_i915_gem_object *obj)
>> {
>> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
>> index 528eea44dccf..5fae0e50aad0 100644
>> --- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
>> +++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
>> @@ -12,6 +12,8 @@
>> #include <drm/drm_syncobj.h>
>> #include <drm/i915_drm.h>
>>
>> +#include "display/intel_frontbuffer.h"
>> +
>> #include "gem/i915_gem_ioctls.h"
>> #include "gt/intel_context.h"
>> #include "gt/intel_gt_pm.h"
>> @@ -21,7 +23,6 @@
>> #include "i915_gem_context.h"
>> #include "i915_trace.h"
>> #include "intel_drv.h"
>> -#include "intel_frontbuffer.h"
>>
>> enum {
>> FORCE_CPU_RELOC = 1,
>> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object.c b/drivers/gpu/drm/i915/gem/i915_gem_object.c
>> index 36b76c6a0a9d..ffd439904b08 100644
>> --- a/drivers/gpu/drm/i915/gem/i915_gem_object.c
>> +++ b/drivers/gpu/drm/i915/gem/i915_gem_object.c
>> @@ -22,12 +22,13 @@
>> *
>> */
>>
>> +#include "display/intel_frontbuffer.h"
>> +
>> #include "i915_drv.h"
>> #include "i915_gem_clflush.h"
>> #include "i915_gem_context.h"
>> #include "i915_gem_object.h"
>> #include "i915_globals.h"
>> -#include "intel_frontbuffer.h"
>>
>> static struct i915_global_object {
>> struct i915_global base;
>> diff --git a/drivers/gpu/drm/i915/gt/intel_reset.c b/drivers/gpu/drm/i915/gt/intel_reset.c
>> index 6368b37f26d1..8ad6bbd12f63 100644
>> --- a/drivers/gpu/drm/i915/gt/intel_reset.c
>> +++ b/drivers/gpu/drm/i915/gt/intel_reset.c
>> @@ -7,6 +7,8 @@
>> #include <linux/sched/mm.h>
>> #include <linux/stop_machine.h>
>>
>> +#include "display/intel_overlay.h"
>> +
>> #include "gem/i915_gem_context.h"
>>
>> #include "i915_drv.h"
>> @@ -17,7 +19,6 @@
>> #include "intel_reset.h"
>>
>> #include "intel_guc.h"
>> -#include "intel_overlay.h"
>>
>> #define RESET_MAX_RETRIES 3
>>
>> diff --git a/drivers/gpu/drm/i915/gvt/opregion.c b/drivers/gpu/drm/i915/gvt/opregion.c
>> index 276db53f1bf1..867e7629025b 100644
>> --- a/drivers/gpu/drm/i915/gvt/opregion.c
>> +++ b/drivers/gpu/drm/i915/gvt/opregion.c
>> @@ -30,7 +30,7 @@
>> * not do like this.
>> */
>> #define _INTEL_BIOS_PRIVATE
>> -#include "intel_vbt_defs.h"
>> +#include "display/intel_vbt_defs.h"
>>
>> #define OPREGION_SIGNATURE "IntelGraphicsMem"
>> #define MBOX_VBT (1<<3)
>> diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
>> index b3425c7dc6bb..081595e58e5f 100644
>> --- a/drivers/gpu/drm/i915/i915_debugfs.c
>> +++ b/drivers/gpu/drm/i915/i915_debugfs.c
>> @@ -33,7 +33,10 @@
>> #include <drm/drm_fourcc.h>
>>
>> #include "display/intel_dp.h"
>> +#include "display/intel_fbc.h"
>> +#include "display/intel_hdcp.h"
>> #include "display/intel_hdmi.h"
>> +#include "display/intel_psr.h"
>>
>> #include "gem/i915_gem_context.h"
>> #include "gt/intel_reset.h"
>> @@ -42,11 +45,8 @@
>> #include "i915_irq.h"
>> #include "intel_csr.h"
>> #include "intel_drv.h"
>> -#include "intel_fbc.h"
>> #include "intel_guc_submission.h"
>> -#include "intel_hdcp.h"
>> #include "intel_pm.h"
>> -#include "intel_psr.h"
>> #include "intel_sideband.h"
>>
>> static inline struct drm_i915_private *node_to_i915(struct drm_info_node *node)
>> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
>> index 9b72387c4101..23a1e441bcf9 100644
>> --- a/drivers/gpu/drm/i915/i915_drv.c
>> +++ b/drivers/gpu/drm/i915/i915_drv.c
>> @@ -47,8 +47,17 @@
>> #include <drm/drm_probe_helper.h>
>> #include <drm/i915_drm.h>
>>
>> +#include "display/intel_acpi.h"
>> +#include "display/intel_audio.h"
>> +#include "display/intel_bw.h"
>> +#include "display/intel_cdclk.h"
>> #include "display/intel_dp.h"
>> +#include "display/intel_fbdev.h"
>> #include "display/intel_gmbus.h"
>> +#include "display/intel_hotplug.h"
>> +#include "display/intel_overlay.h"
>> +#include "display/intel_pipe_crc.h"
>> +#include "display/intel_sprite.h"
>>
>> #include "gem/i915_gem_context.h"
>> #include "gem/i915_gem_ioctls.h"
>> @@ -63,18 +72,9 @@
>> #include "i915_query.h"
>> #include "i915_trace.h"
>> #include "i915_vgpu.h"
>> -#include "intel_acpi.h"
>> -#include "intel_audio.h"
>> -#include "intel_bw.h"
>> -#include "intel_cdclk.h"
>> #include "intel_csr.h"
>> #include "intel_drv.h"
>> -#include "intel_fbdev.h"
>> -#include "intel_hotplug.h"
>> -#include "intel_overlay.h"
>> -#include "intel_pipe_crc.h"
>> #include "intel_pm.h"
>> -#include "intel_sprite.h"
>> #include "intel_uc.h"
>>
>> static struct drm_driver driver;
>> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
>> index eb98d285d290..f2abdce68552 100644
>> --- a/drivers/gpu/drm/i915/i915_drv.h
>> +++ b/drivers/gpu/drm/i915/i915_drv.h
>> @@ -63,17 +63,18 @@
>> #include "i915_reg.h"
>> #include "i915_utils.h"
>>
>> +#include "display/intel_bios.h"
>> +#include "display/intel_display.h"
>> +#include "display/intel_display_power.h"
>> +#include "display/intel_dpll_mgr.h"
>> +#include "display/intel_frontbuffer.h"
>> +#include "display/intel_opregion.h"
>> +
>> #include "gt/intel_lrc.h"
>> #include "gt/intel_engine.h"
>> #include "gt/intel_workarounds.h"
>>
>> -#include "intel_bios.h"
>> #include "intel_device_info.h"
>> -#include "intel_display.h"
>> -#include "intel_display_power.h"
>> -#include "intel_dpll_mgr.h"
>> -#include "intel_frontbuffer.h"
>> -#include "intel_opregion.h"
>> #include "intel_runtime_pm.h"
>> #include "intel_uc.h"
>> #include "intel_uncore.h"
>> diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
>> index 4017ecf561f6..7092d0cd5d2b 100644
>> --- a/drivers/gpu/drm/i915/i915_gem.c
>> +++ b/drivers/gpu/drm/i915/i915_gem.c
>> @@ -38,6 +38,9 @@
>> #include <linux/dma-buf.h>
>> #include <linux/mman.h>
>>
>> +#include "display/intel_display.h"
>> +#include "display/intel_frontbuffer.h"
>> +
>> #include "gem/i915_gem_clflush.h"
>> #include "gem/i915_gem_context.h"
>> #include "gem/i915_gem_ioctls.h"
>> @@ -54,9 +57,7 @@
>> #include "i915_trace.h"
>> #include "i915_vgpu.h"
>>
>> -#include "intel_display.h"
>> #include "intel_drv.h"
>> -#include "intel_frontbuffer.h"
>> #include "intel_pm.h"
>>
>> static int
>> diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
>> index e70675bfb51d..edaf8f534d60 100644
>> --- a/drivers/gpu/drm/i915/i915_gem_gtt.c
>> +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
>> @@ -35,12 +35,13 @@
>>
>> #include <drm/i915_drm.h>
>>
>> +#include "display/intel_frontbuffer.h"
>> +
>> #include "i915_drv.h"
>> #include "i915_scatterlist.h"
>> #include "i915_trace.h"
>> #include "i915_vgpu.h"
>> #include "intel_drv.h"
>> -#include "intel_frontbuffer.h"
>>
>> #define I915_GFP_ALLOW_FAIL (GFP_KERNEL | __GFP_RETRY_MAYFAIL | __GFP_NOWARN)
>>
>> diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
>> index d7f164c9f2eb..6dff91034043 100644
>> --- a/drivers/gpu/drm/i915/i915_gpu_error.c
>> +++ b/drivers/gpu/drm/i915/i915_gpu_error.c
>> @@ -36,14 +36,15 @@
>>
>> #include <drm/drm_print.h>
>>
>> +#include "display/intel_atomic.h"
>> +#include "display/intel_overlay.h"
>> +
>> #include "gem/i915_gem_context.h"
>>
>> #include "i915_drv.h"
>> #include "i915_gpu_error.h"
>> #include "i915_scatterlist.h"
>> -#include "intel_atomic.h"
>> #include "intel_csr.h"
>> -#include "intel_overlay.h"
>>
>> static inline const struct intel_engine_cs *
>> engine_lookup(const struct drm_i915_private *i915, unsigned int id)
>> diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
>> index cd9edddd6718..b7f6e3915562 100644
>> --- a/drivers/gpu/drm/i915/i915_irq.c
>> +++ b/drivers/gpu/drm/i915/i915_irq.c
>> @@ -37,15 +37,16 @@
>> #include <drm/drm_irq.h>
>> #include <drm/i915_drm.h>
>>
>> +#include "display/intel_fifo_underrun.h"
>> +#include "display/intel_hotplug.h"
>> +#include "display/intel_lpe_audio.h"
>> +#include "display/intel_psr.h"
>> +
>> #include "i915_drv.h"
>> #include "i915_irq.h"
>> #include "i915_trace.h"
>> #include "intel_drv.h"
>> -#include "intel_fifo_underrun.h"
>> -#include "intel_hotplug.h"
>> -#include "intel_lpe_audio.h"
>> #include "intel_pm.h"
>> -#include "intel_psr.h"
>>
>> /**
>> * DOC: interrupt handling
>> diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
>> index 482f1d0f1770..6892c0c34f3c 100644
>> --- a/drivers/gpu/drm/i915/i915_pci.c
>> +++ b/drivers/gpu/drm/i915/i915_pci.c
>> @@ -28,10 +28,11 @@
>>
>> #include <drm/drm_drv.h>
>>
>> +#include "display/intel_fbdev.h"
>> +
>> #include "i915_drv.h"
>> #include "i915_globals.h"
>> #include "i915_selftest.h"
>> -#include "intel_fbdev.h"
>>
>> #define PLATFORM(x) .platform = (x)
>> #define GEN(x) .gen = (x), .gen_mask = BIT((x) - 1)
>> diff --git a/drivers/gpu/drm/i915/i915_suspend.c b/drivers/gpu/drm/i915/i915_suspend.c
>> index 1e38a60a8ec7..a08d7d16621b 100644
>> --- a/drivers/gpu/drm/i915/i915_suspend.c
>> +++ b/drivers/gpu/drm/i915/i915_suspend.c
>> @@ -26,11 +26,11 @@
>>
>> #include <drm/i915_drm.h>
>>
>> +#include "display/intel_fbc.h"
>> #include "display/intel_gmbus.h"
>>
>> #include "i915_reg.h"
>> #include "intel_drv.h"
>> -#include "intel_fbc.h"
>>
>> static void i915_save_display(struct drm_i915_private *dev_priv)
>> {
>> diff --git a/drivers/gpu/drm/i915/i915_vma.c b/drivers/gpu/drm/i915/i915_vma.c
>> index cb341e4acf99..e3ddaedeb3b1 100644
>> --- a/drivers/gpu/drm/i915/i915_vma.c
>> +++ b/drivers/gpu/drm/i915/i915_vma.c
>> @@ -22,15 +22,15 @@
>> *
>> */
>>
>> -#include "gt/intel_engine.h"
>> +#include <drm/drm_gem.h>
>>
>> -#include "i915_vma.h"
>> +#include "display/intel_frontbuffer.h"
>> +
>> +#include "gt/intel_engine.h"
>>
>> #include "i915_drv.h"
>> #include "i915_globals.h"
>> -#include "intel_frontbuffer.h"
>> -
>> -#include <drm/drm_gem.h>
>> +#include "i915_vma.h"
>>
>> static struct i915_global_vma {
>> struct i915_global base;
>> diff --git a/drivers/gpu/drm/i915/intel_device_info.h b/drivers/gpu/drm/i915/intel_device_info.h
>> index 3ea953a230b3..b15b4b5e389f 100644
>> --- a/drivers/gpu/drm/i915/intel_device_info.h
>> +++ b/drivers/gpu/drm/i915/intel_device_info.h
>> @@ -27,12 +27,12 @@
>>
>> #include <uapi/drm/i915_drm.h>
>>
>> +#include "display/intel_display.h"
>> +
>> #include "gt/intel_engine_types.h"
>> #include "gt/intel_context_types.h"
>> #include "gt/intel_sseu.h"
>>
>> -#include "intel_display.h"
>> -
>> struct drm_printer;
>> struct drm_i915_private;
>>
>> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
>> index 2c7f3ebc0117..969fb8c208f0 100644
>> --- a/drivers/gpu/drm/i915/intel_pm.c
>> +++ b/drivers/gpu/drm/i915/intel_pm.c
>> @@ -33,13 +33,14 @@
>> #include <drm/drm_fourcc.h>
>> #include <drm/drm_plane_helper.h>
>>
>> +#include "display/intel_atomic.h"
>> +#include "display/intel_fbc.h"
>> +#include "display/intel_sprite.h"
>> +
>> #include "i915_drv.h"
>> #include "i915_irq.h"
>> -#include "intel_atomic.h"
>> #include "intel_drv.h"
>> -#include "intel_fbc.h"
>> #include "intel_pm.h"
>> -#include "intel_sprite.h"
>> #include "intel_sideband.h"
>> #include "../../../platform/x86/intel_ips.h"
>>
>> diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.h b/drivers/gpu/drm/i915/intel_runtime_pm.h
>> index a7acceb13473..22cc1b0cbf83 100644
>> --- a/drivers/gpu/drm/i915/intel_runtime_pm.h
>> +++ b/drivers/gpu/drm/i915/intel_runtime_pm.h
>> @@ -8,7 +8,8 @@
>>
>> #include <linux/types.h>
>>
>> -#include "intel_display.h"
>> +#include "display/intel_display.h"
>> +
>> #include "intel_wakeref.h"
>>
>> struct drm_i915_private;
>
>
--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH v2 1/3] drm/i915: make intel_sdvo_regs.h self-contained
2019-06-13 8:44 [PATCH v2 1/3] drm/i915: make intel_sdvo_regs.h self-contained Jani Nikula
2019-06-13 8:44 ` [PATCH v2 2/3] drm/i915: move modesetting output/encoder code under display/ Jani Nikula
2019-06-13 8:44 ` [PATCH v2 3/3] drm/i915: move modesetting core " Jani Nikula
@ 2019-06-13 9:16 ` Chris Wilson
2019-06-13 9:36 ` Jani Nikula
2019-06-13 9:45 ` ✗ Fi.CI.CHECKPATCH: warning for series starting with [v2,1/3] " Patchwork
` (7 subsequent siblings)
10 siblings, 1 reply; 17+ messages in thread
From: Chris Wilson @ 2019-06-13 9:16 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula
Quoting Jani Nikula (2019-06-13 09:44:14)
> Ensure intel_sdvo_regs.h is self-contained and remains that way.
>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
> drivers/gpu/drm/i915/Makefile.header-test | 1 +
> drivers/gpu/drm/i915/intel_sdvo_regs.h | 7 +++++++
> 2 files changed, 8 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/Makefile.header-test b/drivers/gpu/drm/i915/Makefile.header-test
> index 6ef3b647ac65..c04297ce57b4 100644
> --- a/drivers/gpu/drm/i915/Makefile.header-test
> +++ b/drivers/gpu/drm/i915/Makefile.header-test
> @@ -56,6 +56,7 @@ header_test := \
> intel_quirks.h \
> intel_runtime_pm.h \
> intel_sdvo.h \
> + intel_sdvo_regs.h \
> intel_sideband.h \
> intel_sprite.h \
> intel_tv.h \
> diff --git a/drivers/gpu/drm/i915/intel_sdvo_regs.h b/drivers/gpu/drm/i915/intel_sdvo_regs.h
> index e9ba3b047f93..af02c0d21d6b 100644
> --- a/drivers/gpu/drm/i915/intel_sdvo_regs.h
> +++ b/drivers/gpu/drm/i915/intel_sdvo_regs.h
> @@ -24,6 +24,11 @@
> * Eric Anholt <eric@anholt.net>
> */
>
> +#ifndef __INTEL_SDVO_REGS_H__
> +#define __INTEL_SDVO_REGS_H__
> +
#include <linux/compiler.h> or compiler_attributes.h for __packed
Looks like random inclusion otherwise.
> +#include <linux/types.h>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PATCH v2 1/3] drm/i915: make intel_sdvo_regs.h self-contained
2019-06-13 9:16 ` [PATCH v2 1/3] drm/i915: make intel_sdvo_regs.h self-contained Chris Wilson
@ 2019-06-13 9:36 ` Jani Nikula
2019-06-13 9:38 ` Chris Wilson
0 siblings, 1 reply; 17+ messages in thread
From: Jani Nikula @ 2019-06-13 9:36 UTC (permalink / raw)
To: Chris Wilson, intel-gfx
On Thu, 13 Jun 2019, Chris Wilson <chris@chris-wilson.co.uk> wrote:
> Quoting Jani Nikula (2019-06-13 09:44:14)
>> Ensure intel_sdvo_regs.h is self-contained and remains that way.
>>
>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>> ---
>> drivers/gpu/drm/i915/Makefile.header-test | 1 +
>> drivers/gpu/drm/i915/intel_sdvo_regs.h | 7 +++++++
>> 2 files changed, 8 insertions(+)
>>
>> diff --git a/drivers/gpu/drm/i915/Makefile.header-test b/drivers/gpu/drm/i915/Makefile.header-test
>> index 6ef3b647ac65..c04297ce57b4 100644
>> --- a/drivers/gpu/drm/i915/Makefile.header-test
>> +++ b/drivers/gpu/drm/i915/Makefile.header-test
>> @@ -56,6 +56,7 @@ header_test := \
>> intel_quirks.h \
>> intel_runtime_pm.h \
>> intel_sdvo.h \
>> + intel_sdvo_regs.h \
>> intel_sideband.h \
>> intel_sprite.h \
>> intel_tv.h \
>> diff --git a/drivers/gpu/drm/i915/intel_sdvo_regs.h b/drivers/gpu/drm/i915/intel_sdvo_regs.h
>> index e9ba3b047f93..af02c0d21d6b 100644
>> --- a/drivers/gpu/drm/i915/intel_sdvo_regs.h
>> +++ b/drivers/gpu/drm/i915/intel_sdvo_regs.h
>> @@ -24,6 +24,11 @@
>> * Eric Anholt <eric@anholt.net>
>> */
>>
>> +#ifndef __INTEL_SDVO_REGS_H__
>> +#define __INTEL_SDVO_REGS_H__
>> +
>
> #include <linux/compiler.h> or compiler_attributes.h for __packed
>
> Looks like random inclusion otherwise.
>
>> +#include <linux/types.h>
Huh, no errors about __packed that I could see, what am I missing?
<linux/types.h> is for kernel unsigned types.
BR,
Jani.
--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH v2 1/3] drm/i915: make intel_sdvo_regs.h self-contained
2019-06-13 9:36 ` Jani Nikula
@ 2019-06-13 9:38 ` Chris Wilson
0 siblings, 0 replies; 17+ messages in thread
From: Chris Wilson @ 2019-06-13 9:38 UTC (permalink / raw)
To: Jani Nikula, intel-gfx
Quoting Jani Nikula (2019-06-13 10:36:20)
> On Thu, 13 Jun 2019, Chris Wilson <chris@chris-wilson.co.uk> wrote:
> > Quoting Jani Nikula (2019-06-13 09:44:14)
> >> Ensure intel_sdvo_regs.h is self-contained and remains that way.
> >>
> >> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> >> ---
> >> drivers/gpu/drm/i915/Makefile.header-test | 1 +
> >> drivers/gpu/drm/i915/intel_sdvo_regs.h | 7 +++++++
> >> 2 files changed, 8 insertions(+)
> >>
> >> diff --git a/drivers/gpu/drm/i915/Makefile.header-test b/drivers/gpu/drm/i915/Makefile.header-test
> >> index 6ef3b647ac65..c04297ce57b4 100644
> >> --- a/drivers/gpu/drm/i915/Makefile.header-test
> >> +++ b/drivers/gpu/drm/i915/Makefile.header-test
> >> @@ -56,6 +56,7 @@ header_test := \
> >> intel_quirks.h \
> >> intel_runtime_pm.h \
> >> intel_sdvo.h \
> >> + intel_sdvo_regs.h \
> >> intel_sideband.h \
> >> intel_sprite.h \
> >> intel_tv.h \
> >> diff --git a/drivers/gpu/drm/i915/intel_sdvo_regs.h b/drivers/gpu/drm/i915/intel_sdvo_regs.h
> >> index e9ba3b047f93..af02c0d21d6b 100644
> >> --- a/drivers/gpu/drm/i915/intel_sdvo_regs.h
> >> +++ b/drivers/gpu/drm/i915/intel_sdvo_regs.h
> >> @@ -24,6 +24,11 @@
> >> * Eric Anholt <eric@anholt.net>
> >> */
> >>
> >> +#ifndef __INTEL_SDVO_REGS_H__
> >> +#define __INTEL_SDVO_REGS_H__
> >> +
> >
> > #include <linux/compiler.h> or compiler_attributes.h for __packed
> >
> > Looks like random inclusion otherwise.
> >
> >> +#include <linux/types.h>
>
> Huh, no errors about __packed that I could see, what am I missing?
> <linux/types.h> is for kernel unsigned types.
Nothing, I think it gets accidentally included :)
#include <linux/compiler.h> seems to the be common choice for
__attributes.
Or you could argue that __packed is naturally a type attribute and so
should be pulled in via types.h :)
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 17+ messages in thread
* ✗ Fi.CI.CHECKPATCH: warning for series starting with [v2,1/3] drm/i915: make intel_sdvo_regs.h self-contained
2019-06-13 8:44 [PATCH v2 1/3] drm/i915: make intel_sdvo_regs.h self-contained Jani Nikula
` (2 preceding siblings ...)
2019-06-13 9:16 ` [PATCH v2 1/3] drm/i915: make intel_sdvo_regs.h self-contained Chris Wilson
@ 2019-06-13 9:45 ` Patchwork
2019-06-13 9:47 ` ✗ Fi.CI.SPARSE: " Patchwork
` (6 subsequent siblings)
10 siblings, 0 replies; 17+ messages in thread
From: Patchwork @ 2019-06-13 9:45 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
== Series Details ==
Series: series starting with [v2,1/3] drm/i915: make intel_sdvo_regs.h self-contained
URL : https://patchwork.freedesktop.org/series/62002/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip
4c21ec3a2fa6 drm/i915: make intel_sdvo_regs.h self-contained
f2f555746949 drm/i915: move modesetting output/encoder code under display/
-:144: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating?
#144:
new file mode 100644
total: 0 errors, 1 warnings, 0 checks, 307 lines checked
da6eab3f250f drm/i915: move modesetting core code under display/
-:181: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating?
#181:
rename from drivers/gpu/drm/i915/intel_acpi.c
total: 0 errors, 1 warnings, 0 checks, 445 lines checked
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 17+ messages in thread* ✗ Fi.CI.SPARSE: warning for series starting with [v2,1/3] drm/i915: make intel_sdvo_regs.h self-contained
2019-06-13 8:44 [PATCH v2 1/3] drm/i915: make intel_sdvo_regs.h self-contained Jani Nikula
` (3 preceding siblings ...)
2019-06-13 9:45 ` ✗ Fi.CI.CHECKPATCH: warning for series starting with [v2,1/3] " Patchwork
@ 2019-06-13 9:47 ` Patchwork
2019-06-13 10:08 ` [PATCH v2] " Jani Nikula
` (5 subsequent siblings)
10 siblings, 0 replies; 17+ messages in thread
From: Patchwork @ 2019-06-13 9:47 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
== Series Details ==
Series: series starting with [v2,1/3] drm/i915: make intel_sdvo_regs.h self-contained
URL : https://patchwork.freedesktop.org/series/62002/
State : warning
== Summary ==
$ dim sparse origin/drm-tip
Sparse version: v0.5.2
Commit: drm/i915: make intel_sdvo_regs.h self-contained
Okay!
Commit: drm/i915: move modesetting output/encoder code under display/
+drivers/gpu/drm/i915/display/icl_dsi.c:135:33: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/icl_dsi.c:1404:25: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/icl_dsi.c:1404:25: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/icl_dsi.c:1405:26: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/icl_dsi.c:1405:26: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_ddi.c:671:24: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_ddi.c:673:24: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c:158:21: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c:158:21: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c:158:21: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c:158:21: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c:158:21: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c:158:21: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c:158:21: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:1442:39: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:1442:39: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:1442:39: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:1442:39: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:1442:39: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:1442:39: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:1442:39: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:1442:39: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:1806:23: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:1806:23: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:1939:23: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:1959:25: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:1959:25: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:1981:58: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:1981:58: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:255:16: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:255:16: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:255:16: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:255:16: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:255:16: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:255:16: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:255:16: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:255:16: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:255:16: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:255:16: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:255:16: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:255:16: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:255:16: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:255:16: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:300:30: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:300:30: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:394:28: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:394:28: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:4371:26: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:4371:26: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:4414:27: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:4414:27: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:5941:30: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:6645:31: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:6674:9: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:6674:9: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:6674:9: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:6674:9: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:6675:9: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:6675:9: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:6675:9: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:6675:9: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:6676:9: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:6676:9: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:6676:9: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:6676:9: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:6677:9: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:6677:9: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:6677:9: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:6677:9: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:6678:9: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:6678:9: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:6678:9: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:6678:9: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_gmbus.c:459:31: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_gmbus.c:461:31: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_gmbus.c:461:31: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_gmbus.c:523:23: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_gmbus.c:523:23: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_hdmi.c:2091:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_hdmi.c:2091:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_hdmi.c:2108:42: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_hdmi.c:2108:42: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_hdmi.c:2112:42: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_hdmi.c:2112:42: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_hdmi.c:2115:42: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1558:15: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1558:15: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1558:15: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1558:15: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1558:15: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1558:15: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1558:15: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1607:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1607:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1607:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1607:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1607:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1607:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1607:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1607:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1607:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1607:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1607:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1607:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1607:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1607:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1645:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1645:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1645:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1645:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1645:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1645:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1645:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1645:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1645:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1645:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1645:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1645:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1645:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1645:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1686:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1686:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1686:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1686:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1686:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1686:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1686:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1686:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1686:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1686:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1686:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1686:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1686:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1686:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1720:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1720:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1720:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1720:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1720:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1720:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1720:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1720:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1720:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1720:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1720:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1720:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1720:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1720:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1753:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1753:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1753:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1753:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1753:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1753:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1753:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1753:34: warning: too many warnings
+drivers/gpu/drm/i915/display/intel_panel.c:472:22: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:472:22: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:472:22: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:472:22: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:472:22: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:472:22: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:472:22: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:472:22: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:472:22: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:472:22: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:472:22: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:472:22: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:472:22: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:472:22: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:502:20: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:502:20: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:502:20: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:502:20: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:502:20: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:502:20: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:502:20: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:502:20: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:502:20: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:502:20: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:502:20: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:502:20: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:502:20: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:502:20: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_sdvo.c:1043:21: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_sdvo.c:1043:21: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_sdvo.c:1049:47: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_sdvo.c:410:17: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_sdvo.c:413:17: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_sdvo.c:417:25: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_sdvo.c:422:17: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_sdvo.c:566:17: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_sdvo.c:568:17: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_sdvo.c:579:17: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_sdvo.c:991:47: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_vdsc.c:353:17: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/vlv_dsi.c:102:33: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/vlv_dsi.c:118:33: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/vlv_dsi.c:1731:26: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/vlv_dsi.c:1731:26: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/vlv_dsi.c:1773:25: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/vlv_dsi.c:1773:25: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/vlv_dsi.c:1805:37: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/vlv_dsi.c:1805:37: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/i915_utils.h:220:16: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/i915_utils.h:220:16: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/i915_utils.h:220:16: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/i915_utils.h:220:16: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/i915_utils.h:220:16: warning: expression using sizeof(void)
+./include/linux/slab.h:666:13: error: undefined identifier '__builtin_mul_overflow'
+./include/linux/slab.h:666:13: warning: call with no type!
+./include/uapi/linux/perf_event.h:147:56: warning: cast truncates bits from constant value (8000000000000000 becomes 0)
+./include/uapi/linux/perf_event.h:147:56: warning: cast truncates bits from constant value (8000000000000000 becomes 0)
+./include/uapi/linux/perf_event.h:147:56: warning: cast truncates bits from constant value (8000000000000000 becomes 0)
+./include/uapi/linux/perf_event.h:147:56: warning: cast truncates bits from constant value (8000000000000000 becomes 0)
+./include/uapi/linux/perf_event.h:147:56: warning: cast truncates bits from constant value (8000000000000000 becomes 0)
+./include/uapi/linux/perf_event.h:147:56: warning: cast truncates bits from constant value (8000000000000000 becomes 0)
+./include/uapi/linux/perf_event.h:147:56: war
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 17+ messages in thread* [PATCH v2] drm/i915: make intel_sdvo_regs.h self-contained
2019-06-13 8:44 [PATCH v2 1/3] drm/i915: make intel_sdvo_regs.h self-contained Jani Nikula
` (4 preceding siblings ...)
2019-06-13 9:47 ` ✗ Fi.CI.SPARSE: " Patchwork
@ 2019-06-13 10:08 ` Jani Nikula
2019-06-13 10:12 ` Chris Wilson
2019-06-13 10:15 ` ✓ Fi.CI.BAT: success for series starting with [v2,1/3] " Patchwork
` (4 subsequent siblings)
10 siblings, 1 reply; 17+ messages in thread
From: Jani Nikula @ 2019-06-13 10:08 UTC (permalink / raw)
To: Jani Nikula, intel-gfx
Ensure intel_sdvo_regs.h is self-contained and remains that way.
v2:
- include <linux/compiler.h> for __packed (Chris)
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
| 1 +
drivers/gpu/drm/i915/intel_sdvo_regs.h | 8 ++++++++
2 files changed, 9 insertions(+)
--git a/drivers/gpu/drm/i915/Makefile.header-test b/drivers/gpu/drm/i915/Makefile.header-test
index 6ef3b647ac65..c04297ce57b4 100644
--- a/drivers/gpu/drm/i915/Makefile.header-test
+++ b/drivers/gpu/drm/i915/Makefile.header-test
@@ -56,6 +56,7 @@ header_test := \
intel_quirks.h \
intel_runtime_pm.h \
intel_sdvo.h \
+ intel_sdvo_regs.h \
intel_sideband.h \
intel_sprite.h \
intel_tv.h \
diff --git a/drivers/gpu/drm/i915/intel_sdvo_regs.h b/drivers/gpu/drm/i915/intel_sdvo_regs.h
index e9ba3b047f93..13b9a8e257bb 100644
--- a/drivers/gpu/drm/i915/intel_sdvo_regs.h
+++ b/drivers/gpu/drm/i915/intel_sdvo_regs.h
@@ -24,6 +24,12 @@
* Eric Anholt <eric@anholt.net>
*/
+#ifndef __INTEL_SDVO_REGS_H__
+#define __INTEL_SDVO_REGS_H__
+
+#include <linux/compiler.h>
+#include <linux/types.h>
+
/*
* SDVO command definitions and structures.
*/
@@ -731,3 +737,5 @@ struct intel_sdvo_encode {
u8 dvi_rev;
u8 hdmi_rev;
} __packed;
+
+#endif /* __INTEL_SDVO_REGS_H__ */
--
2.20.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 17+ messages in thread* ✓ Fi.CI.BAT: success for series starting with [v2,1/3] drm/i915: make intel_sdvo_regs.h self-contained
2019-06-13 8:44 [PATCH v2 1/3] drm/i915: make intel_sdvo_regs.h self-contained Jani Nikula
` (5 preceding siblings ...)
2019-06-13 10:08 ` [PATCH v2] " Jani Nikula
@ 2019-06-13 10:15 ` Patchwork
2019-06-13 10:40 ` ✗ Fi.CI.CHECKPATCH: warning for series starting with [v2] drm/i915: make intel_sdvo_regs.h self-contained (rev2) Patchwork
` (3 subsequent siblings)
10 siblings, 0 replies; 17+ messages in thread
From: Patchwork @ 2019-06-13 10:15 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
== Series Details ==
Series: series starting with [v2,1/3] drm/i915: make intel_sdvo_regs.h self-contained
URL : https://patchwork.freedesktop.org/series/62002/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_6256 -> Patchwork_13267
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13267/
Known issues
------------
Here are the changes found in Patchwork_13267 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_basic@create-fd-close:
- fi-icl-u3: [PASS][1] -> [DMESG-WARN][2] ([fdo#107724])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6256/fi-icl-u3/igt@gem_basic@create-fd-close.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13267/fi-icl-u3/igt@gem_basic@create-fd-close.html
* igt@gem_cpu_reloc@basic:
- fi-icl-guc: [PASS][3] -> [INCOMPLETE][4] ([fdo#107713] / [fdo#110246])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6256/fi-icl-guc/igt@gem_cpu_reloc@basic.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13267/fi-icl-guc/igt@gem_cpu_reloc@basic.html
* igt@kms_chamelium@hdmi-hpd-fast:
- fi-kbl-7500u: [PASS][5] -> [FAIL][6] ([fdo#109485])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6256/fi-kbl-7500u/igt@kms_chamelium@hdmi-hpd-fast.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13267/fi-kbl-7500u/igt@kms_chamelium@hdmi-hpd-fast.html
#### Possible fixes ####
* igt@gem_exec_fence@basic-busy-default:
- fi-icl-u3: [DMESG-WARN][7] ([fdo#107724]) -> [PASS][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6256/fi-icl-u3/igt@gem_exec_fence@basic-busy-default.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13267/fi-icl-u3/igt@gem_exec_fence@basic-busy-default.html
* igt@kms_chamelium@dp-crc-fast:
- fi-cml-u2: [FAIL][9] ([fdo#110627]) -> [PASS][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6256/fi-cml-u2/igt@kms_chamelium@dp-crc-fast.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13267/fi-cml-u2/igt@kms_chamelium@dp-crc-fast.html
[fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
[fdo#107724]: https://bugs.freedesktop.org/show_bug.cgi?id=107724
[fdo#109485]: https://bugs.freedesktop.org/show_bug.cgi?id=109485
[fdo#110246]: https://bugs.freedesktop.org/show_bug.cgi?id=110246
[fdo#110627]: https://bugs.freedesktop.org/show_bug.cgi?id=110627
Participating hosts (53 -> 45)
------------------------------
Additional (1): fi-bsw-n3050
Missing (9): fi-kbl-soraka fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-byt-clapper fi-kbl-8809g fi-icl-dsi fi-bdw-samus
Build changes
-------------
* Linux: CI_DRM_6256 -> Patchwork_13267
CI_DRM_6256: 233403ab45fb18ae761e7b28d389c76ffd273154 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5055: 495287320225e7f180d384cad7b207b77154438f @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_13267: da6eab3f250fbb835ecf02e183a8ef8b82dacdec @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
da6eab3f250f drm/i915: move modesetting core code under display/
f2f555746949 drm/i915: move modesetting output/encoder code under display/
4c21ec3a2fa6 drm/i915: make intel_sdvo_regs.h self-contained
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13267/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 17+ messages in thread* ✗ Fi.CI.CHECKPATCH: warning for series starting with [v2] drm/i915: make intel_sdvo_regs.h self-contained (rev2)
2019-06-13 8:44 [PATCH v2 1/3] drm/i915: make intel_sdvo_regs.h self-contained Jani Nikula
` (6 preceding siblings ...)
2019-06-13 10:15 ` ✓ Fi.CI.BAT: success for series starting with [v2,1/3] " Patchwork
@ 2019-06-13 10:40 ` Patchwork
2019-06-13 10:41 ` ✗ Fi.CI.SPARSE: " Patchwork
` (2 subsequent siblings)
10 siblings, 0 replies; 17+ messages in thread
From: Patchwork @ 2019-06-13 10:40 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
== Series Details ==
Series: series starting with [v2] drm/i915: make intel_sdvo_regs.h self-contained (rev2)
URL : https://patchwork.freedesktop.org/series/62002/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip
d6787a862416 drm/i915: make intel_sdvo_regs.h self-contained
4162ebf36132 drm/i915: move modesetting output/encoder code under display/
-:144: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating?
#144:
new file mode 100644
total: 0 errors, 1 warnings, 0 checks, 307 lines checked
21684c82678e drm/i915: move modesetting core code under display/
-:181: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating?
#181:
rename from drivers/gpu/drm/i915/intel_acpi.c
total: 0 errors, 1 warnings, 0 checks, 445 lines checked
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 17+ messages in thread* ✗ Fi.CI.SPARSE: warning for series starting with [v2] drm/i915: make intel_sdvo_regs.h self-contained (rev2)
2019-06-13 8:44 [PATCH v2 1/3] drm/i915: make intel_sdvo_regs.h self-contained Jani Nikula
` (7 preceding siblings ...)
2019-06-13 10:40 ` ✗ Fi.CI.CHECKPATCH: warning for series starting with [v2] drm/i915: make intel_sdvo_regs.h self-contained (rev2) Patchwork
@ 2019-06-13 10:41 ` Patchwork
2019-06-13 12:07 ` ✓ Fi.CI.BAT: success " Patchwork
2019-06-14 21:20 ` ✓ Fi.CI.IGT: " Patchwork
10 siblings, 0 replies; 17+ messages in thread
From: Patchwork @ 2019-06-13 10:41 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
== Series Details ==
Series: series starting with [v2] drm/i915: make intel_sdvo_regs.h self-contained (rev2)
URL : https://patchwork.freedesktop.org/series/62002/
State : warning
== Summary ==
$ dim sparse origin/drm-tip
Sparse version: v0.5.2
Commit: drm/i915: make intel_sdvo_regs.h self-contained
Okay!
Commit: drm/i915: move modesetting output/encoder code under display/
+drivers/gpu/drm/i915/display/icl_dsi.c:135:33: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/icl_dsi.c:1404:25: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/icl_dsi.c:1404:25: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/icl_dsi.c:1405:26: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/icl_dsi.c:1405:26: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_ddi.c:671:24: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_ddi.c:673:24: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c:158:21: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c:158:21: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c:158:21: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c:158:21: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c:158:21: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c:158:21: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c:158:21: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:1442:39: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:1442:39: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:1442:39: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:1442:39: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:1442:39: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:1442:39: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:1442:39: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:1442:39: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:1806:23: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:1806:23: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:1939:23: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:1959:25: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:1959:25: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:1981:58: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:1981:58: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:255:16: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:255:16: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:255:16: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:255:16: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:255:16: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:255:16: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:255:16: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:255:16: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:255:16: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:255:16: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:255:16: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:255:16: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:255:16: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:255:16: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:300:30: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:300:30: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:394:28: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:394:28: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:4371:26: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:4371:26: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:4414:27: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:4414:27: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:5941:30: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:6645:31: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:6674:9: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:6674:9: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:6674:9: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:6674:9: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:6675:9: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:6675:9: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:6675:9: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:6675:9: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:6676:9: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:6676:9: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:6676:9: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:6676:9: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:6677:9: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:6677:9: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:6677:9: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:6677:9: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:6678:9: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:6678:9: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:6678:9: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_dp.c:6678:9: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_gmbus.c:459:31: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_gmbus.c:461:31: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_gmbus.c:461:31: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_gmbus.c:523:23: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_gmbus.c:523:23: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_hdmi.c:2091:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_hdmi.c:2091:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_hdmi.c:2108:42: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_hdmi.c:2108:42: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_hdmi.c:2112:42: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_hdmi.c:2112:42: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_hdmi.c:2115:42: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1558:15: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1558:15: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1558:15: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1558:15: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1558:15: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1558:15: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1558:15: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1607:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1607:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1607:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1607:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1607:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1607:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1607:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1607:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1607:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1607:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1607:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1607:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1607:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1607:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1645:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1645:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1645:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1645:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1645:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1645:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1645:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1645:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1645:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1645:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1645:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1645:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1645:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1645:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1686:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1686:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1686:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1686:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1686:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1686:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1686:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1686:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1686:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1686:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1686:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1686:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1686:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1686:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1720:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1720:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1720:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1720:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1720:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1720:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1720:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1720:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1720:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1720:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1720:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1720:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1720:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1720:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1753:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1753:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1753:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1753:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1753:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1753:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1753:34: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:1753:34: warning: too many warnings
+drivers/gpu/drm/i915/display/intel_panel.c:472:22: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:472:22: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:472:22: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:472:22: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:472:22: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:472:22: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:472:22: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:472:22: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:472:22: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:472:22: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:472:22: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:472:22: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:472:22: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:472:22: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:502:20: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:502:20: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:502:20: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:502:20: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:502:20: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:502:20: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:502:20: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:502:20: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:502:20: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:502:20: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:502:20: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:502:20: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:502:20: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_panel.c:502:20: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_sdvo.c:1043:21: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_sdvo.c:1043:21: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_sdvo.c:1049:47: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_sdvo.c:410:17: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_sdvo.c:413:17: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_sdvo.c:417:25: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_sdvo.c:422:17: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_sdvo.c:566:17: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_sdvo.c:568:17: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_sdvo.c:579:17: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_sdvo.c:991:47: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/intel_vdsc.c:353:17: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/vlv_dsi.c:102:33: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/vlv_dsi.c:118:33: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/vlv_dsi.c:1731:26: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/vlv_dsi.c:1731:26: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/vlv_dsi.c:1773:25: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/vlv_dsi.c:1773:25: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/vlv_dsi.c:1805:37: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/display/vlv_dsi.c:1805:37: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/i915_utils.h:220:16: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/i915_utils.h:220:16: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/i915_utils.h:220:16: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/i915_utils.h:220:16: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/i915_utils.h:220:16: warning: expression using sizeof(void)
+./include/linux/slab.h:666:13: error: undefined identifier '__builtin_mul_overflow'
+./include/linux/slab.h:666:13: warning: call with no type!
+./include/uapi/linux/perf_event.h:147:56: warning: cast truncates bits from constant value (8000000000000000 becomes 0)
+./include/uapi/linux/perf_event.h:147:56: warning: cast truncates bits from constant value (8000000000000000 becomes 0)
+./include/uapi/linux/perf_event.h:147:56: warning: cast truncates bits from constant value (8000000000000000 becomes 0)
+./include/uapi/linux/perf_event.h:147:56: warning: cast truncates bits from constant value (8000000000000000 becomes 0)
+./include/uapi/linux/perf_event.h:147:56: warning: cast truncates bits from constant value (8000000000000000 becomes 0)
+./include/uapi/linux/perf_event.h:147:56: warning: cast truncates bits from constant value (8000000000000000 becomes 0)
+./include/uapi/linux/perf_event.h:147:56: war
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 17+ messages in thread* ✓ Fi.CI.BAT: success for series starting with [v2] drm/i915: make intel_sdvo_regs.h self-contained (rev2)
2019-06-13 8:44 [PATCH v2 1/3] drm/i915: make intel_sdvo_regs.h self-contained Jani Nikula
` (8 preceding siblings ...)
2019-06-13 10:41 ` ✗ Fi.CI.SPARSE: " Patchwork
@ 2019-06-13 12:07 ` Patchwork
2019-06-14 21:20 ` ✓ Fi.CI.IGT: " Patchwork
10 siblings, 0 replies; 17+ messages in thread
From: Patchwork @ 2019-06-13 12:07 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
== Series Details ==
Series: series starting with [v2] drm/i915: make intel_sdvo_regs.h self-contained (rev2)
URL : https://patchwork.freedesktop.org/series/62002/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_6257 -> Patchwork_13268
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13268/
Known issues
------------
Here are the changes found in Patchwork_13268 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_ctx_switch@basic-default:
- fi-icl-u2: [PASS][1] -> [INCOMPLETE][2] ([fdo#107713] / [fdo#108569])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6257/fi-icl-u2/igt@gem_ctx_switch@basic-default.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13268/fi-icl-u2/igt@gem_ctx_switch@basic-default.html
- fi-icl-guc: [PASS][3] -> [INCOMPLETE][4] ([fdo#107713] / [fdo#108569])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6257/fi-icl-guc/igt@gem_ctx_switch@basic-default.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13268/fi-icl-guc/igt@gem_ctx_switch@basic-default.html
#### Possible fixes ####
* igt@gem_exec_fence@basic-busy-default:
- fi-icl-y: [INCOMPLETE][5] ([fdo#107713]) -> [PASS][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6257/fi-icl-y/igt@gem_exec_fence@basic-busy-default.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13268/fi-icl-y/igt@gem_exec_fence@basic-busy-default.html
* igt@gem_exec_suspend@basic-s3:
- fi-blb-e6850: [INCOMPLETE][7] ([fdo#107718]) -> [PASS][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6257/fi-blb-e6850/igt@gem_exec_suspend@basic-s3.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13268/fi-blb-e6850/igt@gem_exec_suspend@basic-s3.html
[fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
[fdo#107718]: https://bugs.freedesktop.org/show_bug.cgi?id=107718
[fdo#108569]: https://bugs.freedesktop.org/show_bug.cgi?id=108569
Participating hosts (53 -> 46)
------------------------------
Additional (1): fi-icl-dsi
Missing (8): fi-kbl-soraka fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-icl-u3 fi-byt-clapper fi-bdw-samus
Build changes
-------------
* Linux: CI_DRM_6257 -> Patchwork_13268
CI_DRM_6257: e941a46d520ab5d255071d8bf84f97feec92a20b @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5055: 495287320225e7f180d384cad7b207b77154438f @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_13268: 21684c82678eca20c6d6f1351905c7b06df7a275 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
21684c82678e drm/i915: move modesetting core code under display/
4162ebf36132 drm/i915: move modesetting output/encoder code under display/
d6787a862416 drm/i915: make intel_sdvo_regs.h self-contained
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13268/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 17+ messages in thread* ✓ Fi.CI.IGT: success for series starting with [v2] drm/i915: make intel_sdvo_regs.h self-contained (rev2)
2019-06-13 8:44 [PATCH v2 1/3] drm/i915: make intel_sdvo_regs.h self-contained Jani Nikula
` (9 preceding siblings ...)
2019-06-13 12:07 ` ✓ Fi.CI.BAT: success " Patchwork
@ 2019-06-14 21:20 ` Patchwork
10 siblings, 0 replies; 17+ messages in thread
From: Patchwork @ 2019-06-14 21:20 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
== Series Details ==
Series: series starting with [v2] drm/i915: make intel_sdvo_regs.h self-contained (rev2)
URL : https://patchwork.freedesktop.org/series/62002/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_6257_full -> Patchwork_13268_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
Known issues
------------
Here are the changes found in Patchwork_13268_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_eio@in-flight-10ms:
- shard-kbl: [PASS][1] -> [DMESG-WARN][2] ([fdo#110913 ])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6257/shard-kbl1/igt@gem_eio@in-flight-10ms.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13268/shard-kbl4/igt@gem_eio@in-flight-10ms.html
* igt@gem_exec_balancer@smoke:
- shard-iclb: [PASS][3] -> [SKIP][4] ([fdo#110854])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6257/shard-iclb1/igt@gem_exec_balancer@smoke.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13268/shard-iclb5/igt@gem_exec_balancer@smoke.html
* igt@gem_persistent_relocs@forked-thrashing:
- shard-hsw: [PASS][5] -> [DMESG-WARN][6] ([fdo#110789] / [fdo#110913 ]) +1 similar issue
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6257/shard-hsw7/igt@gem_persistent_relocs@forked-thrashing.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13268/shard-hsw4/igt@gem_persistent_relocs@forked-thrashing.html
* igt@gem_userptr_blits@map-fixed-invalidate-busy:
- shard-skl: [PASS][7] -> [DMESG-WARN][8] ([fdo#110913 ])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6257/shard-skl6/igt@gem_userptr_blits@map-fixed-invalidate-busy.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13268/shard-skl2/igt@gem_userptr_blits@map-fixed-invalidate-busy.html
* igt@gem_userptr_blits@map-fixed-invalidate-overlap-busy:
- shard-snb: [PASS][9] -> [DMESG-WARN][10] ([fdo#110913 ])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6257/shard-snb7/igt@gem_userptr_blits@map-fixed-invalidate-overlap-busy.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13268/shard-snb1/igt@gem_userptr_blits@map-fixed-invalidate-overlap-busy.html
- shard-hsw: [PASS][11] -> [DMESG-WARN][12] ([fdo#110913 ])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6257/shard-hsw1/igt@gem_userptr_blits@map-fixed-invalidate-overlap-busy.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13268/shard-hsw6/igt@gem_userptr_blits@map-fixed-invalidate-overlap-busy.html
* igt@gem_userptr_blits@map-fixed-invalidate-overlap-busy-gup:
- shard-apl: [PASS][13] -> [DMESG-WARN][14] ([fdo#110913 ])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6257/shard-apl8/igt@gem_userptr_blits@map-fixed-invalidate-overlap-busy-gup.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13268/shard-apl6/igt@gem_userptr_blits@map-fixed-invalidate-overlap-busy-gup.html
* igt@gem_userptr_blits@sync-unmap-cycles:
- shard-glk: [PASS][15] -> [DMESG-WARN][16] ([fdo#110913 ]) +1 similar issue
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6257/shard-glk9/igt@gem_userptr_blits@sync-unmap-cycles.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13268/shard-glk9/igt@gem_userptr_blits@sync-unmap-cycles.html
* igt@kms_cursor_crc@pipe-b-cursor-suspend:
- shard-apl: [PASS][17] -> [DMESG-WARN][18] ([fdo#108566]) +1 similar issue
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6257/shard-apl4/igt@kms_cursor_crc@pipe-b-cursor-suspend.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13268/shard-apl7/igt@kms_cursor_crc@pipe-b-cursor-suspend.html
* igt@kms_cursor_legacy@2x-long-flip-vs-cursor-legacy:
- shard-glk: [PASS][19] -> [FAIL][20] ([fdo#104873])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6257/shard-glk1/igt@kms_cursor_legacy@2x-long-flip-vs-cursor-legacy.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13268/shard-glk1/igt@kms_cursor_legacy@2x-long-flip-vs-cursor-legacy.html
* igt@kms_flip@2x-flip-vs-absolute-wf_vblank:
- shard-hsw: [PASS][21] -> [SKIP][22] ([fdo#109271]) +23 similar issues
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6257/shard-hsw4/igt@kms_flip@2x-flip-vs-absolute-wf_vblank.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13268/shard-hsw1/igt@kms_flip@2x-flip-vs-absolute-wf_vblank.html
* igt@kms_flip@flip-vs-expired-vblank-interruptible:
- shard-glk: [PASS][23] -> [FAIL][24] ([fdo#102887] / [fdo#105363])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6257/shard-glk5/igt@kms_flip@flip-vs-expired-vblank-interruptible.html
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13268/shard-glk2/igt@kms_flip@flip-vs-expired-vblank-interruptible.html
* igt@kms_frontbuffer_tracking@fbc-badstride:
- shard-iclb: [PASS][25] -> [FAIL][26] ([fdo#103167]) +2 similar issues
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6257/shard-iclb6/igt@kms_frontbuffer_tracking@fbc-badstride.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13268/shard-iclb8/igt@kms_frontbuffer_tracking@fbc-badstride.html
* igt@kms_psr@psr2_primary_page_flip:
- shard-iclb: [PASS][27] -> [SKIP][28] ([fdo#109441])
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6257/shard-iclb2/igt@kms_psr@psr2_primary_page_flip.html
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13268/shard-iclb1/igt@kms_psr@psr2_primary_page_flip.html
* igt@kms_sysfs_edid_timing:
- shard-iclb: [PASS][29] -> [FAIL][30] ([fdo#100047])
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6257/shard-iclb1/igt@kms_sysfs_edid_timing.html
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13268/shard-iclb3/igt@kms_sysfs_edid_timing.html
#### Possible fixes ####
* igt@gem_persistent_relocs@forked-faulting-reloc-thrashing:
- shard-hsw: [DMESG-WARN][31] ([fdo#110789] / [fdo#110913 ]) -> [PASS][32] +1 similar issue
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6257/shard-hsw1/igt@gem_persistent_relocs@forked-faulting-reloc-thrashing.html
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13268/shard-hsw7/igt@gem_persistent_relocs@forked-faulting-reloc-thrashing.html
* igt@gem_persistent_relocs@forked-thrashing:
- shard-glk: [DMESG-WARN][33] ([fdo#110913 ]) -> [PASS][34] +1 similar issue
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6257/shard-glk6/igt@gem_persistent_relocs@forked-thrashing.html
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13268/shard-glk3/igt@gem_persistent_relocs@forked-thrashing.html
- shard-snb: [DMESG-WARN][35] ([fdo#110789] / [fdo#110913 ]) -> [PASS][36]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6257/shard-snb2/igt@gem_persistent_relocs@forked-thrashing.html
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13268/shard-snb6/igt@gem_persistent_relocs@forked-thrashing.html
* igt@gem_ppgtt@blt-vs-render-ctx0:
- shard-skl: [DMESG-WARN][37] ([fdo#110913 ]) -> [PASS][38] +1 similar issue
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6257/shard-skl1/igt@gem_ppgtt@blt-vs-render-ctx0.html
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13268/shard-skl9/igt@gem_ppgtt@blt-vs-render-ctx0.html
* igt@gem_tiled_swapping@non-threaded:
- shard-apl: [DMESG-WARN][39] ([fdo#108686]) -> [PASS][40]
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6257/shard-apl1/igt@gem_tiled_swapping@non-threaded.html
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13268/shard-apl2/igt@gem_tiled_swapping@non-threaded.html
- shard-iclb: [FAIL][41] ([fdo#108686]) -> [PASS][42]
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6257/shard-iclb5/igt@gem_tiled_swapping@non-threaded.html
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13268/shard-iclb2/igt@gem_tiled_swapping@non-threaded.html
* igt@gem_userptr_blits@map-fixed-invalidate-busy:
- shard-kbl: [DMESG-WARN][43] ([fdo#110913 ]) -> [PASS][44]
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6257/shard-kbl1/igt@gem_userptr_blits@map-fixed-invalidate-busy.html
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13268/shard-kbl1/igt@gem_userptr_blits@map-fixed-invalidate-busy.html
* igt@gem_userptr_blits@map-fixed-invalidate-overlap-busy:
- shard-apl: [DMESG-WARN][45] ([fdo#110913 ]) -> [PASS][46]
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6257/shard-apl7/igt@gem_userptr_blits@map-fixed-invalidate-overlap-busy.html
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13268/shard-apl8/igt@gem_userptr_blits@map-fixed-invalidate-overlap-busy.html
* igt@gem_userptr_blits@map-fixed-invalidate-overlap-busy-gup:
- shard-hsw: [DMESG-WARN][47] ([fdo#110913 ]) -> [PASS][48]
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6257/shard-hsw6/igt@gem_userptr_blits@map-fixed-invalidate-overlap-busy-gup.html
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13268/shard-hsw4/igt@gem_userptr_blits@map-fixed-invalidate-overlap-busy-gup.html
* igt@kms_cursor_legacy@flip-vs-cursor-toggle:
- shard-iclb: [INCOMPLETE][49] ([fdo#107713]) -> [PASS][50]
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6257/shard-iclb7/igt@kms_cursor_legacy@flip-vs-cursor-toggle.html
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13268/shard-iclb4/igt@kms_cursor_legacy@flip-vs-cursor-toggle.html
* igt@kms_draw_crc@draw-method-xrgb2101010-mmap-gtt-untiled:
- shard-skl: [FAIL][51] ([fdo#103184] / [fdo#103232] / [fdo#108472]) -> [PASS][52]
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6257/shard-skl2/igt@kms_draw_crc@draw-method-xrgb2101010-mmap-gtt-untiled.html
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13268/shard-skl8/igt@kms_draw_crc@draw-method-xrgb2101010-mmap-gtt-untiled.html
* igt@kms_flip@flip-vs-expired-vblank:
- shard-skl: [FAIL][53] ([fdo#102887]) -> [PASS][54]
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6257/shard-skl2/igt@kms_flip@flip-vs-expired-vblank.html
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13268/shard-skl3/igt@kms_flip@flip-vs-expired-vblank.html
* igt@kms_flip@flip-vs-suspend:
- shard-skl: [INCOMPLETE][55] ([fdo#109507]) -> [PASS][56]
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6257/shard-skl4/igt@kms_flip@flip-vs-suspend.html
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13268/shard-skl3/igt@kms_flip@flip-vs-suspend.html
- shard-hsw: [INCOMPLETE][57] ([fdo#103540]) -> [PASS][58]
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6257/shard-hsw6/igt@kms_flip@flip-vs-suspend.html
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13268/shard-hsw2/igt@kms_flip@flip-vs-suspend.html
* igt@kms_frontbuffer_tracking@fbc-1p-offscren-pri-shrfb-draw-pwrite:
- shard-iclb: [FAIL][59] ([fdo#103167]) -> [PASS][60] +6 similar issues
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6257/shard-iclb1/igt@kms_frontbuffer_tracking@fbc-1p-offscren-pri-shrfb-draw-pwrite.html
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13268/shard-iclb5/igt@kms_frontbuffer_tracking@fbc-1p-offscren-pri-shrfb-draw-pwrite.html
* igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-cur-indfb-draw-pwrite:
- shard-hsw: [SKIP][61] ([fdo#109271]) -> [PASS][62] +11 similar issues
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6257/shard-hsw1/igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-cur-indfb-draw-pwrite.html
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13268/shard-hsw6/igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-cur-indfb-draw-pwrite.html
* igt@kms_frontbuffer_tracking@fbc-suspend:
- shard-kbl: [DMESG-WARN][63] ([fdo#108566]) -> [PASS][64]
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6257/shard-kbl7/igt@kms_frontbuffer_tracking@fbc-suspend.html
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13268/shard-kbl3/igt@kms_frontbuffer_tracking@fbc-suspend.html
- shard-apl: [DMESG-WARN][65] ([fdo#108566]) -> [PASS][66] +4 similar issues
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6257/shard-apl7/igt@kms_frontbuffer_tracking@fbc-suspend.html
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13268/shard-apl1/igt@kms_frontbuffer_tracking@fbc-suspend.html
* igt@kms_plane@plane-panning-bottom-right-suspend-pipe-c-planes:
- shard-iclb: [INCOMPLETE][67] ([fdo#107713] / [fdo#110042]) -> [PASS][68]
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6257/shard-iclb3/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-c-planes.html
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13268/shard-iclb6/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-c-planes.html
* igt@kms_plane_alpha_blend@pipe-c-coverage-7efc:
- shard-skl: [FAIL][69] ([fdo#108145] / [fdo#110403]) -> [PASS][70]
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6257/shard-skl1/igt@kms_plane_alpha_blend@pipe-c-coverage-7efc.html
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13268/shard-skl5/igt@kms_plane_alpha_blend@pipe-c-coverage-7efc.html
* igt@kms_plane_lowres@pipe-a-tiling-x:
- shard-iclb: [FAIL][71] ([fdo#103166]) -> [PASS][72]
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6257/shard-iclb7/igt@kms_plane_lowres@pipe-a-tiling-x.html
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13268/shard-iclb4/igt@kms_plane_lowres@pipe-a-tiling-x.html
* igt@kms_psr@psr2_cursor_plane_onoff:
- shard-iclb: [SKIP][73] ([fdo#109441]) -> [PASS][74]
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6257/shard-iclb5/igt@kms_psr@psr2_cursor_plane_onoff.html
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13268/shard-iclb2/igt@kms_psr@psr2_cursor_plane_onoff.html
* igt@kms_setmode@basic:
- shard-glk: [FAIL][75] ([fdo#99912]) -> [PASS][76]
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6257/shard-glk5/igt@kms_setmode@basic.html
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13268/shard-glk2/igt@kms_setmode@basic.html
- shard-kbl: [FAIL][77] ([fdo#99912]) -> [PASS][78]
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6257/shard-kbl7/igt@kms_setmode@basic.html
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13268/shard-kbl3/igt@kms_setmode@basic.html
* igt@perf_pmu@rc6-runtime-pm:
- shard-hsw: [FAIL][79] ([fdo#105010]) -> [PASS][80]
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6257/shard-hsw5/igt@perf_pmu@rc6-runtime-pm.html
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13268/shard-hsw4/igt@perf_pmu@rc6-runtime-pm.html
#### Warnings ####
* igt@gem_tiled_swapping@non-threaded:
- shard-hsw: [INCOMPLETE][81] ([fdo#103540]) -> [FAIL][82] ([fdo#108686])
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6257/shard-hsw5/igt@gem_tiled_swapping@non-threaded.html
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13268/shard-hsw4/igt@gem_tiled_swapping@non-threaded.html
* igt@kms_frontbuffer_tracking@fbcpsr-1p-pri-indfb-multidraw:
- shard-iclb: [INCOMPLETE][83] ([fdo#106978] / [fdo#107713]) -> [FAIL][84] ([fdo#103167])
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6257/shard-iclb7/igt@kms_frontbuffer_tracking@fbcpsr-1p-pri-indfb-multidraw.html
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13268/shard-iclb1/igt@kms_frontbuffer_tracking@fbcpsr-1p-pri-indfb-multidraw.html
* igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-shrfb-pgflip-blt:
- shard-skl: [FAIL][85] ([fdo#103167]) -> [FAIL][86] ([fdo#108040])
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6257/shard-skl4/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-shrfb-pgflip-blt.html
[86]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13268/shard-skl3/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-shrfb-pgflip-blt.html
[fdo#100047]: https://bugs.freedesktop.org/show_bug.cgi?id=100047
[fdo#102887]: https://bugs.freedesktop.org/show_bug.cgi?id=102887
[fdo#103166]: https://bugs.freedesktop.org/show_bug.cgi?id=103166
[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#104873]: https://bugs.freedesktop.org/show_bug.cgi?id=104873
[fdo#105010]: https://bugs.freedesktop.org/show_bug.cgi?id=105010
[fdo#105363]: https://bugs.freedesktop.org/show_bug.cgi?id=105363
[fdo#106978]: https://bugs.freedesktop.org/show_bug.cgi?id=106978
[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#108472]: https://bugs.freedesktop.org/show_bug.cgi?id=108472
[fdo#108566]: https://bugs.freedesktop.org/show_bug.cgi?id=108566
[fdo#108686]: https://bugs.freedesktop.org/show_bug.cgi?id=108686
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#109507]: https://bugs.freedesktop.org/show_bug.cgi?id=109507
[fdo#110042]: https://bugs.freedesktop.org/show_bug.cgi?id=110042
[fdo#110403]: https://bugs.freedesktop.org/show_bug.cgi?id=110403
[fdo#110789]: https://bugs.freedesktop.org/show_bug.cgi?id=110789
[fdo#110854]: https://bugs.freedesktop.org/show_bug.cgi?id=110854
[fdo#110913 ]: https://bugs.freedesktop.org/show_bug.cgi?id=110913
[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_6257 -> Patchwork_13268
CI_DRM_6257: e941a46d520ab5d255071d8bf84f97feec92a20b @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5055: 495287320225e7f180d384cad7b207b77154438f @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_13268: 21684c82678eca20c6d6f1351905c7b06df7a275 @ 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_13268/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 17+ messages in thread