mirror of
https://github.com/ukui/kernel.git
synced 2026-03-09 10:07:04 -07:00
drm/i915: move modesetting output/encoder code under display/
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> Acked-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Acked-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Signed-off-by: Jani Nikula <jani.nikula@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20190613084416.6794-2-jani.nikula@intel.com
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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 $@
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
# Extra header tests
|
||||
include $(src)/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)))
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user