* [RFC 1/2] drm/i915: move modesetting output/encoder code under display/
@ 2019-06-10 21:53 Jani Nikula
2019-06-10 21:53 ` [RFC 2/2] drm/i915: move modesetting core " Jani Nikula
` (3 more replies)
0 siblings, 4 replies; 8+ messages in thread
From: Jani Nikula @ 2019-06-10 21:53 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.
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>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/Makefile | 55 ++++++++++---------
drivers/gpu/drm/i915/Makefile.header-test | 18 ------
drivers/gpu/drm/i915/display/Makefile | 2 +
.../gpu/drm/i915/display/Makefile.header-test | 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
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 +-
60 files changed, 81 insertions(+), 69 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_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..b67d584b5bc7 100644
--- a/drivers/gpu/drm/i915/Makefile
+++ b/drivers/gpu/drm/i915/Makefile
@@ -176,33 +176,34 @@ 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_aux_backlight.o \
+ display/intel_dp_link_training.o \
+ display/intel_dp_mst.o \
+ display/intel_dp.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/vlv_dsi.o \
+ display/vlv_dsi_pll.o \
+ display/intel_vdsc.o
# Post-mortem debug and GPU hang state capture
i915-$(CONFIG_DRM_I915_CAPTURE_ERROR) += i915_gpu_error.o
diff --git a/drivers/gpu/drm/i915/Makefile.header-test b/drivers/gpu/drm/i915/Makefile.header-test
index 6ef3b647ac65..5a04858c9b7b 100644
--- a/drivers/gpu/drm/i915/Makefile.header-test
+++ b/drivers/gpu/drm/i915/Makefile.header-test
@@ -22,45 +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_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
diff --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_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 f212241a2758..e993d9f67681 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 1af6751e1b36..2fec4641fd8d 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 62fa573f90e8..e2b89329a802 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 278a7edc94f5..df9a44f3a6ce 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] 8+ messages in thread* [RFC 2/2] drm/i915: move modesetting core code under display/ 2019-06-10 21:53 [RFC 1/2] drm/i915: move modesetting output/encoder code under display/ Jani Nikula @ 2019-06-10 21:53 ` Jani Nikula 2019-06-11 7:52 ` Chris Wilson 2019-06-10 22:46 ` ✓ Fi.CI.BAT: success for series starting with [RFC,1/2] drm/i915: move modesetting output/encoder " Patchwork ` (2 subsequent siblings) 3 siblings, 1 reply; 8+ messages in thread From: Jani Nikula @ 2019-06-10 21:53 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. 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> Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- drivers/gpu/drm/i915/Makefile | 61 ++++++++++--------- drivers/gpu/drm/i915/Makefile.header-test | 25 -------- .../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 .../drm/i915/{ => display}/intel_sideband.c | 0 .../drm/i915/{ => display}/intel_sideband.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 | 8 +-- 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_sysfs.c | 3 +- drivers/gpu/drm/i915/i915_vma.c | 10 +-- drivers/gpu/drm/i915/intel_device_info.h | 4 +- drivers/gpu/drm/i915/intel_pm.c | 9 +-- drivers/gpu/drm/i915/intel_runtime_pm.h | 3 +- 80 files changed, 95 insertions(+), 105 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_sideband.c (100%) rename drivers/gpu/drm/i915/{ => display}/intel_sideband.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 b67d584b5bc7..ca7513365a0e 100644 --- a/drivers/gpu/drm/i915/Makefile +++ b/drivers/gpu/drm/i915/Makefile @@ -63,7 +63,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 +149,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_audio.o \ + display/intel_atomic.o \ + display/intel_atomic_plane.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_sideband.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 \ display/dvo_ivch.o \ @@ -241,8 +245,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..be27babbc84b 100644 --- a/drivers/gpu/drm/i915/Makefile.header-test +++ b/drivers/gpu/drm/i915/Makefile.header-test @@ -13,35 +13,10 @@ 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_sideband.c b/drivers/gpu/drm/i915/display/intel_sideband.c similarity index 100% rename from drivers/gpu/drm/i915/intel_sideband.c rename to drivers/gpu/drm/i915/display/intel_sideband.c diff --git a/drivers/gpu/drm/i915/intel_sideband.h b/drivers/gpu/drm/i915/display/intel_sideband.h similarity index 100% rename from drivers/gpu/drm/i915/intel_sideband.h rename to drivers/gpu/drm/i915/display/intel_sideband.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 e5deae62681f..457cdd8849dd 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 2c4f3229361d..d35e16417a3f 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 a0bc8f7ab780..baa468a9f935 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 60d24110af80..fe639fb6a7d1 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 e993d9f67681..7eb9f6f3eab5 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c @@ -33,7 +33,11 @@ #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 "display/intel_sideband.h" #include "gem/i915_gem_context.h" #include "gt/intel_reset.h" @@ -42,12 +46,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 2fec4641fd8d..918c53f757c0 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 d3c02e009a98..9b604527affc 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 9f2e213c6046..0bab3abe3e5a 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 2e15850bd987..d9abe43ccff8 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 a523bf050a25..871e0de6f9a5 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 11c451358fb8..0ee608283f34 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_sysfs.c b/drivers/gpu/drm/i915/i915_sysfs.c index 3ef07b987d40..94ae06694c27 100644 --- a/drivers/gpu/drm/i915/i915_sysfs.c +++ b/drivers/gpu/drm/i915/i915_sysfs.c @@ -30,10 +30,11 @@ #include <linux/stat.h> #include <linux/sysfs.h> +#include "display/intel_sideband.h" + #include "i915_drv.h" #include "intel_drv.h" #include "intel_pm.h" -#include "intel_sideband.h" static inline struct drm_i915_private *kdev_minor_to_i915(struct device *kdev) { diff --git a/drivers/gpu/drm/i915/i915_vma.c b/drivers/gpu/drm/i915/i915_vma.c index f6ac8394da77..924962f9942d 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 1fb8b50df7df..5ba671c8f50b 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 d7272d4ff258..ac2d104565bf 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -33,14 +33,15 @@ #include <drm/drm_fourcc.h> #include <drm/drm_plane_helper.h> +#include "display/intel_atomic.h" +#include "display/intel_fbc.h" +#include "display/intel_sideband.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] 8+ messages in thread
* Re: [RFC 2/2] drm/i915: move modesetting core code under display/ 2019-06-10 21:53 ` [RFC 2/2] drm/i915: move modesetting core " Jani Nikula @ 2019-06-11 7:52 ` Chris Wilson 2019-06-11 17:24 ` Rodrigo Vivi 0 siblings, 1 reply; 8+ messages in thread From: Chris Wilson @ 2019-06-11 7:52 UTC (permalink / raw) To: intel-gfx; +Cc: jani.nikula Quoting Jani Nikula (2019-06-10 22:53:12) > 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. Yup. I've a patch to decouple it from GEM slightly, but we may want to go full observer mode. Although that seems like overkill as the intention is make userspace explicitly generate such notifications (i.e. along the lines of DIRTYFB). However, the implicit back-channel notifications are much easier to organise. > 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> > Signed-off-by: Jani Nikula <jani.nikula@intel.com> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> -Chris _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [RFC 2/2] drm/i915: move modesetting core code under display/ 2019-06-11 7:52 ` Chris Wilson @ 2019-06-11 17:24 ` Rodrigo Vivi 0 siblings, 0 replies; 8+ messages in thread From: Rodrigo Vivi @ 2019-06-11 17:24 UTC (permalink / raw) To: Chris Wilson; +Cc: Jani Nikula, intel-gfx On Tue, Jun 11, 2019 at 08:52:31AM +0100, Chris Wilson wrote: > Quoting Jani Nikula (2019-06-10 22:53:12) > > 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. > > Yup. I've a patch to decouple it from GEM slightly, but we may want to > go full observer mode. Although that seems like overkill as the > intention is make userspace explicitly generate such notifications (i.e. > along the lines of DIRTYFB). However, the implicit back-channel > notifications are much easier to organise. > > > Cc: Chris Wilson <chris@chris-wilson.co.uk> > > Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> > > Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com> > > Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> > > Signed-off-by: Jani Nikula <jani.nikula@intel.com> > > Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> > -Chris _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 8+ messages in thread
* ✓ Fi.CI.BAT: success for series starting with [RFC,1/2] drm/i915: move modesetting output/encoder code under display/ 2019-06-10 21:53 [RFC 1/2] drm/i915: move modesetting output/encoder code under display/ Jani Nikula 2019-06-10 21:53 ` [RFC 2/2] drm/i915: move modesetting core " Jani Nikula @ 2019-06-10 22:46 ` Patchwork 2019-06-11 7:47 ` [RFC 1/2] " Chris Wilson 2019-06-12 5:38 ` ✓ Fi.CI.IGT: success for series starting with [RFC,1/2] " Patchwork 3 siblings, 0 replies; 8+ messages in thread From: Patchwork @ 2019-06-10 22:46 UTC (permalink / raw) To: Jani Nikula; +Cc: intel-gfx == Series Details == Series: series starting with [RFC,1/2] drm/i915: move modesetting output/encoder code under display/ URL : https://patchwork.freedesktop.org/series/61865/ State : success == Summary == CI Bug Log - changes from CI_DRM_6230 -> Patchwork_13230 ==================================================== Summary ------- **SUCCESS** No regressions found. External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13230/ Known issues ------------ Here are the changes found in Patchwork_13230 that come from known issues: ### IGT changes ### #### Issues hit #### * igt@gem_ctx_create@basic: - fi-icl-u3: [PASS][1] -> [DMESG-WARN][2] ([fdo#107724]) [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6230/fi-icl-u3/igt@gem_ctx_create@basic.html [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13230/fi-icl-u3/igt@gem_ctx_create@basic.html * igt@kms_chamelium@hdmi-hpd-fast: - fi-kbl-7500u: [PASS][3] -> [FAIL][4] ([fdo#109485]) [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6230/fi-kbl-7500u/igt@kms_chamelium@hdmi-hpd-fast.html [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13230/fi-kbl-7500u/igt@kms_chamelium@hdmi-hpd-fast.html #### Possible fixes #### * igt@gem_mmap@basic-small-bo: - fi-icl-u3: [DMESG-WARN][5] ([fdo#107724]) -> [PASS][6] +2 similar issues [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6230/fi-icl-u3/igt@gem_mmap@basic-small-bo.html [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13230/fi-icl-u3/igt@gem_mmap@basic-small-bo.html * igt@i915_selftest@live_contexts: - fi-bdw-gvtdvm: [DMESG-FAIL][7] ([fdo#110235]) -> [PASS][8] [7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6230/fi-bdw-gvtdvm/igt@i915_selftest@live_contexts.html [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13230/fi-bdw-gvtdvm/igt@i915_selftest@live_contexts.html {name}: This element is suppressed. This means it is ignored when computing the status of the difference (SUCCESS, WARNING, or FAILURE). [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#110235]: https://bugs.freedesktop.org/show_bug.cgi?id=110235 Participating hosts (54 -> 47) ------------------------------ Missing (7): fi-kbl-soraka fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-byt-clapper fi-bdw-samus Build changes ------------- * Linux: CI_DRM_6230 -> Patchwork_13230 CI_DRM_6230: 57bd224fa47bfe2a2b83fbfcfc48aaded027d211 @ git://anongit.freedesktop.org/gfx-ci/linux IGT_5050: 4c072238c784e6acb00634a80c3c55fb8358058b @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools Patchwork_13230: 619dc92bb2e54211a071b6d54cbb6d2c48d731f4 @ git://anongit.freedesktop.org/gfx-ci/linux == Linux commits == 619dc92bb2e5 drm/i915: move modesetting core code under display/ b49cf84c98a3 drm/i915: move modesetting output/encoder code under display/ == Logs == For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13230/ _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [RFC 1/2] drm/i915: move modesetting output/encoder code under display/ 2019-06-10 21:53 [RFC 1/2] drm/i915: move modesetting output/encoder code under display/ Jani Nikula 2019-06-10 21:53 ` [RFC 2/2] drm/i915: move modesetting core " Jani Nikula 2019-06-10 22:46 ` ✓ Fi.CI.BAT: success for series starting with [RFC,1/2] drm/i915: move modesetting output/encoder " Patchwork @ 2019-06-11 7:47 ` Chris Wilson 2019-06-11 17:24 ` Rodrigo Vivi 2019-06-12 5:38 ` ✓ Fi.CI.IGT: success for series starting with [RFC,1/2] " Patchwork 3 siblings, 1 reply; 8+ messages in thread From: Chris Wilson @ 2019-06-11 7:47 UTC (permalink / raw) To: intel-gfx; +Cc: jani.nikula Quoting Jani Nikula (2019-06-10 22:53:11) > 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. > > 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> > Signed-off-by: Jani Nikula <jani.nikula@intel.com> Only surprisingly clean because you already done the hard work :) Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> -Chris _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [RFC 1/2] drm/i915: move modesetting output/encoder code under display/ 2019-06-11 7:47 ` [RFC 1/2] " Chris Wilson @ 2019-06-11 17:24 ` Rodrigo Vivi 0 siblings, 0 replies; 8+ messages in thread From: Rodrigo Vivi @ 2019-06-11 17:24 UTC (permalink / raw) To: Chris Wilson; +Cc: Jani Nikula, intel-gfx On Tue, Jun 11, 2019 at 08:47:07AM +0100, Chris Wilson wrote: > Quoting Jani Nikula (2019-06-10 22:53:11) > > 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. > > > > Cc: Chris Wilson <chris@chris-wilson.co.uk> > > Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> > > Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com> > > Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> > > Signed-off-by: Jani Nikula <jani.nikula@intel.com> > > Only surprisingly clean because you already done the hard work :) > > Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> > -Chris _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 8+ messages in thread
* ✓ Fi.CI.IGT: success for series starting with [RFC,1/2] drm/i915: move modesetting output/encoder code under display/ 2019-06-10 21:53 [RFC 1/2] drm/i915: move modesetting output/encoder code under display/ Jani Nikula ` (2 preceding siblings ...) 2019-06-11 7:47 ` [RFC 1/2] " Chris Wilson @ 2019-06-12 5:38 ` Patchwork 3 siblings, 0 replies; 8+ messages in thread From: Patchwork @ 2019-06-12 5:38 UTC (permalink / raw) To: Jani Nikula; +Cc: intel-gfx == Series Details == Series: series starting with [RFC,1/2] drm/i915: move modesetting output/encoder code under display/ URL : https://patchwork.freedesktop.org/series/61865/ State : success == Summary == CI Bug Log - changes from CI_DRM_6230_full -> Patchwork_13230_full ==================================================== Summary ------- **WARNING** Minor unknown changes coming with Patchwork_13230_full need to be verified manually. If you think the reported changes have nothing to do with the changes introduced in Patchwork_13230_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI. Possible new issues ------------------- Here are the unknown changes that may have been introduced in Patchwork_13230_full: ### IGT changes ### #### Warnings #### * igt@kms_hdmi_inject@inject-audio: - shard-iclb: [DMESG-FAIL][1] ([fdo#109593]) -> [DMESG-FAIL][2] [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6230/shard-iclb1/igt@kms_hdmi_inject@inject-audio.html [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13230/shard-iclb8/igt@kms_hdmi_inject@inject-audio.html Known issues ------------ Here are the changes found in Patchwork_13230_full that come from known issues: ### IGT changes ### #### Issues hit #### * igt@gem_mmap_wc@set-cache-level: - shard-snb: [PASS][3] -> [SKIP][4] ([fdo#109271]) [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6230/shard-snb2/igt@gem_mmap_wc@set-cache-level.html [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13230/shard-snb6/igt@gem_mmap_wc@set-cache-level.html * igt@gem_workarounds@suspend-resume-fd: - shard-skl: [PASS][5] -> [INCOMPLETE][6] ([fdo#104108]) +1 similar issue [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6230/shard-skl4/igt@gem_workarounds@suspend-resume-fd.html [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13230/shard-skl6/igt@gem_workarounds@suspend-resume-fd.html * igt@kms_draw_crc@draw-method-xrgb8888-pwrite-ytiled: - shard-skl: [PASS][7] -> [FAIL][8] ([fdo#103184] / [fdo#103232] / [fdo#108222]) [7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6230/shard-skl7/igt@kms_draw_crc@draw-method-xrgb8888-pwrite-ytiled.html [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13230/shard-skl4/igt@kms_draw_crc@draw-method-xrgb8888-pwrite-ytiled.html * igt@kms_flip@flip-vs-suspend-interruptible: - shard-apl: [PASS][9] -> [DMESG-WARN][10] ([fdo#108566]) +3 similar issues [9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6230/shard-apl7/igt@kms_flip@flip-vs-suspend-interruptible.html [10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13230/shard-apl1/igt@kms_flip@flip-vs-suspend-interruptible.html * igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-blt: - shard-iclb: [PASS][11] -> [FAIL][12] ([fdo#103167]) +1 similar issue [11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6230/shard-iclb6/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-blt.html [12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13230/shard-iclb4/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-blt.html * igt@kms_plane_lowres@pipe-a-tiling-x: - shard-iclb: [PASS][13] -> [FAIL][14] ([fdo#103166]) [13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6230/shard-iclb8/igt@kms_plane_lowres@pipe-a-tiling-x.html [14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13230/shard-iclb4/igt@kms_plane_lowres@pipe-a-tiling-x.html * igt@kms_rotation_crc@multiplane-rotation-cropping-top: - shard-kbl: [PASS][15] -> [FAIL][16] ([fdo#109016]) [15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6230/shard-kbl3/igt@kms_rotation_crc@multiplane-rotation-cropping-top.html [16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13230/shard-kbl6/igt@kms_rotation_crc@multiplane-rotation-cropping-top.html * igt@kms_setmode@basic: - shard-skl: [PASS][17] -> [FAIL][18] ([fdo#99912]) [17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6230/shard-skl1/igt@kms_setmode@basic.html [18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13230/shard-skl6/igt@kms_setmode@basic.html - shard-hsw: [PASS][19] -> [FAIL][20] ([fdo#99912]) [19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6230/shard-hsw1/igt@kms_setmode@basic.html [20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13230/shard-hsw8/igt@kms_setmode@basic.html * igt@perf@polling: - shard-skl: [PASS][21] -> [FAIL][22] ([fdo#110728]) [21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6230/shard-skl7/igt@perf@polling.html [22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13230/shard-skl5/igt@perf@polling.html #### Possible fixes #### * igt@gem_eio@in-flight-suspend: - shard-glk: [FAIL][23] ([fdo#110667]) -> [PASS][24] [23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6230/shard-glk2/igt@gem_eio@in-flight-suspend.html [24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13230/shard-glk9/igt@gem_eio@in-flight-suspend.html * igt@i915_suspend@sysfs-reader: - shard-apl: [DMESG-WARN][25] ([fdo#108566]) -> [PASS][26] +1 similar issue [25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6230/shard-apl5/igt@i915_suspend@sysfs-reader.html [26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13230/shard-apl4/igt@i915_suspend@sysfs-reader.html * igt@kms_cursor_crc@pipe-b-cursor-128x128-onscreen: - shard-apl: [INCOMPLETE][27] ([fdo#103927]) -> [PASS][28] [27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6230/shard-apl8/igt@kms_cursor_crc@pipe-b-cursor-128x128-onscreen.html [28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13230/shard-apl5/igt@kms_cursor_crc@pipe-b-cursor-128x128-onscreen.html * igt@kms_flip@2x-flip-vs-expired-vblank-interruptible: - shard-glk: [FAIL][29] ([fdo#105363]) -> [PASS][30] [29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6230/shard-glk7/igt@kms_flip@2x-flip-vs-expired-vblank-interruptible.html [30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13230/shard-glk3/igt@kms_flip@2x-flip-vs-expired-vblank-interruptible.html * igt@kms_flip@2x-plain-flip-ts-check-interruptible: - shard-hsw: [SKIP][31] ([fdo#109271]) -> [PASS][32] +22 similar issues [31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6230/shard-hsw1/igt@kms_flip@2x-plain-flip-ts-check-interruptible.html [32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13230/shard-hsw2/igt@kms_flip@2x-plain-flip-ts-check-interruptible.html * igt@kms_flip@flip-vs-expired-vblank-interruptible: - shard-skl: [FAIL][33] ([fdo#105363]) -> [PASS][34] [33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6230/shard-skl5/igt@kms_flip@flip-vs-expired-vblank-interruptible.html [34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13230/shard-skl1/igt@kms_flip@flip-vs-expired-vblank-interruptible.html - shard-apl: [FAIL][35] ([fdo#102887] / [fdo#105363]) -> [PASS][36] [35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6230/shard-apl8/igt@kms_flip@flip-vs-expired-vblank-interruptible.html [36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13230/shard-apl2/igt@kms_flip@flip-vs-expired-vblank-interruptible.html * igt@kms_frontbuffer_tracking@fbc-1p-primscrn-shrfb-plflip-blt: - shard-iclb: [FAIL][37] ([fdo#103167]) -> [PASS][38] +3 similar issues [37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6230/shard-iclb7/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-shrfb-plflip-blt.html [38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13230/shard-iclb1/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-shrfb-plflip-blt.html * igt@kms_plane_alpha_blend@pipe-c-coverage-7efc: - shard-skl: [FAIL][39] ([fdo#108145] / [fdo#110403]) -> [PASS][40] [39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6230/shard-skl3/igt@kms_plane_alpha_blend@pipe-c-coverage-7efc.html [40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13230/shard-skl5/igt@kms_plane_alpha_blend@pipe-c-coverage-7efc.html #### Warnings #### * igt@gem_tiled_swapping@non-threaded: - shard-hsw: [INCOMPLETE][41] ([fdo#103540]) -> [FAIL][42] ([fdo#108686]) [41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6230/shard-hsw1/igt@gem_tiled_swapping@non-threaded.html [42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13230/shard-hsw4/igt@gem_tiled_swapping@non-threaded.html * igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-shrfb-draw-render: - shard-skl: [FAIL][43] ([fdo#103167]) -> [FAIL][44] ([fdo#108040]) +1 similar issue [43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6230/shard-skl2/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-shrfb-draw-render.html [44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13230/shard-skl2/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-shrfb-draw-render.html {name}: This element is suppressed. This means it is ignored when computing the status of the difference (SUCCESS, WARNING, or FAILURE). [fdo#102887]: https://bugs.freedesktop.org/show_bug.cgi?id=102887 [fdo#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#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927 [fdo#104108]: https://bugs.freedesktop.org/show_bug.cgi?id=104108 [fdo#105363]: https://bugs.freedesktop.org/show_bug.cgi?id=105363 [fdo#108040]: https://bugs.freedesktop.org/show_bug.cgi?id=108040 [fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145 [fdo#108222]: https://bugs.freedesktop.org/show_bug.cgi?id=108222 [fdo#108566]: https://bugs.freedesktop.org/show_bug.cgi?id=108566 [fdo#108686]: https://bugs.freedesktop.org/show_bug.cgi?id=108686 [fdo#109016]: https://bugs.freedesktop.org/show_bug.cgi?id=109016 [fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271 [fdo#109593]: https://bugs.freedesktop.org/show_bug.cgi?id=109593 [fdo#110403]: https://bugs.freedesktop.org/show_bug.cgi?id=110403 [fdo#110667]: https://bugs.freedesktop.org/show_bug.cgi?id=110667 [fdo#110728]: https://bugs.freedesktop.org/show_bug.cgi?id=110728 [fdo#110854]: https://bugs.freedesktop.org/show_bug.cgi?id=110854 [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_6230 -> Patchwork_13230 CI_DRM_6230: 57bd224fa47bfe2a2b83fbfcfc48aaded027d211 @ git://anongit.freedesktop.org/gfx-ci/linux IGT_5050: 4c072238c784e6acb00634a80c3c55fb8358058b @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools Patchwork_13230: 619dc92bb2e54211a071b6d54cbb6d2c48d731f4 @ 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_13230/ _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2019-06-12 5:38 UTC | newest] Thread overview: 8+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2019-06-10 21:53 [RFC 1/2] drm/i915: move modesetting output/encoder code under display/ Jani Nikula 2019-06-10 21:53 ` [RFC 2/2] drm/i915: move modesetting core " Jani Nikula 2019-06-11 7:52 ` Chris Wilson 2019-06-11 17:24 ` Rodrigo Vivi 2019-06-10 22:46 ` ✓ Fi.CI.BAT: success for series starting with [RFC,1/2] drm/i915: move modesetting output/encoder " Patchwork 2019-06-11 7:47 ` [RFC 1/2] " Chris Wilson 2019-06-11 17:24 ` Rodrigo Vivi 2019-06-12 5:38 ` ✓ Fi.CI.IGT: success for series starting with [RFC,1/2] " Patchwork
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox