Commit df0566a6 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915: move modesetting core code under display/ 



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: default avatarChris Wilson <chris@chris-wilson.co.uk>
Acked-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Acked-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190613084416.6794-3-jani.nikula@intel.com
parent 02ae8ba9

drivers/gpu/drm/i915/Makefile

+34 −32
Original line number Diff line number Diff line
@@ -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

drivers/gpu/drm/i915/Makefile.header-test

+0 −24
Original line number Diff line number Diff line
@@ -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

drivers/gpu/drm/i915/display/Makefile.header-test

+1 −1
Original line number Diff line number Diff line
@@ -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)\"" > $@

CRA Git | Maintained and supported by SUSTech CRA and CCSE