Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 417f2544 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-next-2019-06-19' of git://anongit.freedesktop.org/drm/drm-intel into drm-next 



Features:
- HDR support (Uma, Ville)
- Add I2C symlink under HDMI connector similar to DP (Oleg)
- Add ICL multi-segmented gamma support (Shashank, Uma)
- Update register whitelist support for new hardware (Robert, John)
- GuC firmware update with updated ABI interface (Michal, Oscar)
- Add support for new DMC header versions (Lucas)
- In-kernel blitter client for selftest use (Matthew)
- Add Mule Creec Canyon (MCC) PCH support to go with EHL (Matt)
- EHL platform feature updates (Matt)
- Use Command Transport Buffers with GuC on all gens (Daniele)
- New i915.force_probe module parameter to replace i915.alpha_support (Jani)

Refactoring:
- Better runtime PM code abstraction/encapsulation (Daniele)
- VBT parsing cleanup and improvements (Jani)
- Move display code to its own subdirectory (Jani)
- Header cleanup (Jani, Daniele)
- Prep work for subsclice mask expansion (Stuart)
- Use uncore mmio register accessors more, remove unused macro wrappers (Tvrtko)
- Remove unused atomic property get/set stubs (Maarten)
- GTT cleanups and improvements (Mika)
- Pass intel_ types instead of drm_ types in plenty of display code (Ville)
- Engine reset, hangcheck, fault code cleanups and improvements (Tvrtko)
- Consider AML variants simply as either KBL or CFL ULX (Ville)
- State checker cleanups and improvements (Ville)
- GEM code reorganization to more files under gem subdirectory (Chris)
- Reducing dependency on a coarse struct_mutex (Chris)

Fixes:
- Fix use of uninitialized/incorrect error pointers (Colin, Dan)
- Fix DSI fastboot on some VLV/CHV platforms (Hans)
- Fix DSI error path (Hans)
- Add ICL port A combo PHY HW state check (Imre)
- Fix ICL AUX-B HW not done issue (Imre)
- Fix perf whitelist on gen10+ (Lionel)
- Fix PSR exit by forcing manual exit on older gens (José)
- Match voltage ranges instead of exact values (Lucas)
- Fix SDVO HDMI audio, with cleanups (Ville)
- Fix plane state dumps (Ville)
- Fix driver cleanup code to support driver hot unbind (Janusz)
- Add checks for ICL memory bandwidth requirements (Ville)
- Fix toggling between no C8 planes vs. at least one C8 plane (Ville)
- Improved checks on PLL usage conditions, refactoring (Ville)
- Avoid clobbering M/N values in fastset fuzzy checks (Ville)
- Take a runtime pm wakeref for atomic commits (Chris)
- Do not allow runtime pm autosuspend to remove userspace GGTT mmaps too quickly (Chris)
- Avoid refcount_inc on known zero count to avoid debug flagging (Chris)

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/87v9x1lpdh.fsf@intel.com
parents 39a207d0 1ee008f2

Documentation/gpu/i915.rst

+39 −48
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ Intel GVT-g Host Support(vGPU device model) 
Workarounds

-----------



.. kernel-doc:: drivers/gpu/drm/i915/intel_workarounds.c

.. kernel-doc:: drivers/gpu/drm/i915/gt/intel_workarounds.c

   :doc: Hardware workarounds



Display Hardware Handling
@@ -82,13 +82,13 @@ change. 
Frontbuffer Tracking

--------------------



.. kernel-doc:: drivers/gpu/drm/i915/intel_frontbuffer.c

.. kernel-doc:: drivers/gpu/drm/i915/display/intel_frontbuffer.c

   :doc: frontbuffer tracking



.. kernel-doc:: drivers/gpu/drm/i915/intel_frontbuffer.h

.. kernel-doc:: drivers/gpu/drm/i915/display/intel_frontbuffer.h

   :internal:



.. kernel-doc:: drivers/gpu/drm/i915/intel_frontbuffer.c

.. kernel-doc:: drivers/gpu/drm/i915/display/intel_frontbuffer.c

   :internal:



.. kernel-doc:: drivers/gpu/drm/i915/i915_gem.c
@@ -97,10 +97,10 @@ Frontbuffer Tracking 
Display FIFO Underrun Reporting

-------------------------------



.. kernel-doc:: drivers/gpu/drm/i915/intel_fifo_underrun.c

.. kernel-doc:: drivers/gpu/drm/i915/display/intel_fifo_underrun.c

   :doc: fifo underrun handling



.. kernel-doc:: drivers/gpu/drm/i915/intel_fifo_underrun.c

.. kernel-doc:: drivers/gpu/drm/i915/display/intel_fifo_underrun.c

   :internal:



Plane Configuration
@@ -115,10 +115,10 @@ panel self refresh. 
Atomic Plane Helpers

--------------------



.. kernel-doc:: drivers/gpu/drm/i915/intel_atomic_plane.c

.. kernel-doc:: drivers/gpu/drm/i915/display/intel_atomic_plane.c

   :doc: atomic plane helpers



.. kernel-doc:: drivers/gpu/drm/i915/intel_atomic_plane.c

.. kernel-doc:: drivers/gpu/drm/i915/display/intel_atomic_plane.c

   :internal:



Output Probing
@@ -132,19 +132,19 @@ probing, so those sections fully apply. 
Hotplug

-------



.. kernel-doc:: drivers/gpu/drm/i915/intel_hotplug.c

.. kernel-doc:: drivers/gpu/drm/i915/display/intel_hotplug.c

   :doc: Hotplug



.. kernel-doc:: drivers/gpu/drm/i915/intel_hotplug.c

.. kernel-doc:: drivers/gpu/drm/i915/display/intel_hotplug.c

   :internal:



High Definition Audio

---------------------



.. kernel-doc:: drivers/gpu/drm/i915/intel_audio.c

.. kernel-doc:: drivers/gpu/drm/i915/display/intel_audio.c

   :doc: High Definition Audio over HDMI and Display Port



.. kernel-doc:: drivers/gpu/drm/i915/intel_audio.c

.. kernel-doc:: drivers/gpu/drm/i915/display/intel_audio.c

   :internal:



.. kernel-doc:: include/drm/i915_component.h
@@ -153,58 +153,58 @@ High Definition Audio 
Intel HDMI LPE Audio Support

----------------------------



.. kernel-doc:: drivers/gpu/drm/i915/intel_lpe_audio.c

.. kernel-doc:: drivers/gpu/drm/i915/display/intel_lpe_audio.c

   :doc: LPE Audio integration for HDMI or DP playback



.. kernel-doc:: drivers/gpu/drm/i915/intel_lpe_audio.c

.. kernel-doc:: drivers/gpu/drm/i915/display/intel_lpe_audio.c

   :internal:



Panel Self Refresh PSR (PSR/SRD)

--------------------------------



.. kernel-doc:: drivers/gpu/drm/i915/intel_psr.c

.. kernel-doc:: drivers/gpu/drm/i915/display/intel_psr.c

   :doc: Panel Self Refresh (PSR/SRD)



.. kernel-doc:: drivers/gpu/drm/i915/intel_psr.c

.. kernel-doc:: drivers/gpu/drm/i915/display/intel_psr.c

   :internal:



Frame Buffer Compression (FBC)

------------------------------



.. kernel-doc:: drivers/gpu/drm/i915/intel_fbc.c

.. kernel-doc:: drivers/gpu/drm/i915/display/intel_fbc.c

   :doc: Frame Buffer Compression (FBC)



.. kernel-doc:: drivers/gpu/drm/i915/intel_fbc.c

.. kernel-doc:: drivers/gpu/drm/i915/display/intel_fbc.c

   :internal:



Display Refresh Rate Switching (DRRS)

-------------------------------------



.. kernel-doc:: drivers/gpu/drm/i915/intel_dp.c

.. kernel-doc:: drivers/gpu/drm/i915/display/intel_dp.c

   :doc: Display Refresh Rate Switching (DRRS)



.. kernel-doc:: drivers/gpu/drm/i915/intel_dp.c

.. kernel-doc:: drivers/gpu/drm/i915/display/intel_dp.c

   :functions: intel_dp_set_drrs_state



.. kernel-doc:: drivers/gpu/drm/i915/intel_dp.c

.. kernel-doc:: drivers/gpu/drm/i915/display/intel_dp.c

   :functions: intel_edp_drrs_enable



.. kernel-doc:: drivers/gpu/drm/i915/intel_dp.c

.. kernel-doc:: drivers/gpu/drm/i915/display/intel_dp.c

   :functions: intel_edp_drrs_disable



.. kernel-doc:: drivers/gpu/drm/i915/intel_dp.c

.. kernel-doc:: drivers/gpu/drm/i915/display/intel_dp.c

   :functions: intel_edp_drrs_invalidate



.. kernel-doc:: drivers/gpu/drm/i915/intel_dp.c

.. kernel-doc:: drivers/gpu/drm/i915/display/intel_dp.c

   :functions: intel_edp_drrs_flush



.. kernel-doc:: drivers/gpu/drm/i915/intel_dp.c

.. kernel-doc:: drivers/gpu/drm/i915/display/intel_dp.c

   :functions: intel_dp_drrs_init



DPIO

----



.. kernel-doc:: drivers/gpu/drm/i915/intel_dpio_phy.c

.. kernel-doc:: drivers/gpu/drm/i915/display/intel_dpio_phy.c

   :doc: DPIO



CSR firmware support for DMC
@@ -219,34 +219,34 @@ CSR firmware support for DMC 
Video BIOS Table (VBT)

----------------------



.. kernel-doc:: drivers/gpu/drm/i915/intel_bios.c

.. kernel-doc:: drivers/gpu/drm/i915/display/intel_bios.c

   :doc: Video BIOS Table (VBT)



.. kernel-doc:: drivers/gpu/drm/i915/intel_bios.c

.. kernel-doc:: drivers/gpu/drm/i915/display/intel_bios.c

   :internal:



.. kernel-doc:: drivers/gpu/drm/i915/intel_vbt_defs.h

.. kernel-doc:: drivers/gpu/drm/i915/display/intel_vbt_defs.h

   :internal:



Display clocks

--------------



.. kernel-doc:: drivers/gpu/drm/i915/intel_cdclk.c

.. kernel-doc:: drivers/gpu/drm/i915/display/intel_cdclk.c

   :doc: CDCLK / RAWCLK



.. kernel-doc:: drivers/gpu/drm/i915/intel_cdclk.c

.. kernel-doc:: drivers/gpu/drm/i915/display/intel_cdclk.c

   :internal:



Display PLLs

------------



.. kernel-doc:: drivers/gpu/drm/i915/intel_dpll_mgr.c

.. kernel-doc:: drivers/gpu/drm/i915/display/intel_dpll_mgr.c

   :doc: Display PLLs



.. kernel-doc:: drivers/gpu/drm/i915/intel_dpll_mgr.c

.. kernel-doc:: drivers/gpu/drm/i915/display/intel_dpll_mgr.c

   :internal:



.. kernel-doc:: drivers/gpu/drm/i915/intel_dpll_mgr.h

.. kernel-doc:: drivers/gpu/drm/i915/display/intel_dpll_mgr.h

   :internal:



Memory Management and Command Submission
@@ -349,7 +349,7 @@ of buffer object caches. Shrinking is used to make main memory 
available. Note that this is mostly orthogonal to evicting buffer

objects, which has the goal to make space in gpu virtual address spaces.



.. kernel-doc:: drivers/gpu/drm/i915/i915_gem_shrinker.c

.. kernel-doc:: drivers/gpu/drm/i915/gem/i915_gem_shrinker.c

   :internal:



Batchbuffer Parsing
@@ -373,18 +373,15 @@ Batchbuffer Pools 
User Batchbuffer Execution

--------------------------



.. kernel-doc:: drivers/gpu/drm/i915/i915_gem_execbuffer.c

.. kernel-doc:: drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c

   :doc: User command execution



Logical Rings, Logical Ring Contexts and Execlists

--------------------------------------------------



.. kernel-doc:: drivers/gpu/drm/i915/intel_lrc.c

.. kernel-doc:: drivers/gpu/drm/i915/gt/intel_lrc.c

   :doc: Logical Rings, Logical Ring Contexts and Execlists



.. kernel-doc:: drivers/gpu/drm/i915/intel_lrc.c

   :internal:



Global GTT views

----------------
@@ -415,10 +412,10 @@ Hardware Tiling and Swizzling Details 
Object Tiling IOCTLs

--------------------



.. kernel-doc:: drivers/gpu/drm/i915/i915_gem_tiling.c

.. kernel-doc:: drivers/gpu/drm/i915/gem/i915_gem_tiling.c

   :internal:



.. kernel-doc:: drivers/gpu/drm/i915/i915_gem_tiling.c

.. kernel-doc:: drivers/gpu/drm/i915/gem/i915_gem_tiling.c

   :doc: buffer object tiling



WOPCM
@@ -478,12 +475,6 @@ i915_context_create and i915_context_free 
.. kernel-doc:: drivers/gpu/drm/i915/i915_trace.h

   :doc: i915_context_create and i915_context_free tracepoints



switch_mm

---------



.. kernel-doc:: drivers/gpu/drm/i915/i915_trace.h

   :doc: switch_mm tracepoint



Perf

====

drivers/gpu/drm/i915/Kconfig

+19 −10
Original line number Diff line number Diff line
@@ -45,19 +45,28 @@ config DRM_I915 
config DRM_I915_ALPHA_SUPPORT

	bool "Enable alpha quality support for new Intel hardware by default"

	depends on DRM_I915

	default n

	help

	  Choose this option if you have new Intel hardware and want to enable

	  the alpha quality i915 driver support for the hardware in this kernel

	  version. You can also enable the support at runtime using the module

	  parameter i915.alpha_support=1; this option changes the default for

	  that module parameter.

	  This option is deprecated. Use DRM_I915_FORCE_PROBE option instead.



	  It is recommended to upgrade to a kernel version with proper support

	  as soon as it is available. Generally fixes for platforms with alpha

	  support are not backported to older kernels.

config DRM_I915_FORCE_PROBE

	string "Force probe driver for selected new Intel hardware"

	depends on DRM_I915

	default "*" if DRM_I915_ALPHA_SUPPORT

	help

	  This is the default value for the i915.force_probe module

	  parameter. Using the module parameter overrides this option.



	  If in doubt, say "N".

	  Force probe the driver for new Intel graphics devices that are

	  recognized but not properly supported by this kernel version. It is

	  recommended to upgrade to a kernel version with proper support as soon

	  as it is available.



	  Use "" to disable force probe. If in doubt, use this.



	  Use "<pci-id>[,<pci-id>,...]" to force probe the driver for listed

	  devices. For example, "4500" or "4500,4571".



	  Use "*" to force probe the driver for all known devices.



config DRM_I915_CAPTURE_ERROR

	bool "Enable capturing GPU state following a hang"

drivers/gpu/drm/i915/Kconfig.debug

+15 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ config DRM_I915_DEBUG 
        depends on DRM_I915

        select DEBUG_FS

        select PREEMPT_COUNT

        select REFCOUNT_FULL

        select I2C_CHARDEV

        select STACKDEPOT

        select DRM_DP_AUX_CHARDEV
@@ -32,6 +33,7 @@ config DRM_I915_DEBUG 
	select DRM_I915_SW_FENCE_DEBUG_OBJECTS

	select DRM_I915_SELFTEST

	select DRM_I915_DEBUG_RUNTIME_PM

	select DRM_I915_DEBUG_MMIO

        default n

        help

          Choose this option to turn on extra driver debugging that may affect
@@ -41,6 +43,19 @@ config DRM_I915_DEBUG 


          If in doubt, say "N".



config DRM_I915_DEBUG_MMIO

	bool "Always insert extra checks around mmio access by default"

	default n

	help

	  By default, always enables the extra sanity checks (extra register

	  reads) around every mmio (register) access that will slow the system

	  down. This sets the default value of i915.mmio_debug to -1 and can

	  be overridden at module load.



	  Recommended for driver developers only.



	  If in doubt, say "N".



config DRM_I915_DEBUG_GEM

        bool "Insert extra checks into the GEM internals"

        default n

drivers/gpu/drm/i915/Kconfig.profile

+15 −1
Original line number Diff line number Diff line 
config DRM_I915_USERFAULT_AUTOSUSPEND

	int "Runtime autosuspend delay for userspace GGTT mmaps (ms)"

	default 250 # milliseconds

	help

	  On runtime suspend, as we suspend the device, we have to revoke

	  userspace GGTT mmaps and force userspace to take a pagefault on

	  their next access. The revocation and subsequent recreation of

	  the GGTT mmap can be very slow and so we impose a small hysteris

	  that complements the runtime-pm autosuspend and provides a lower

	  floor on the autosuspend delay.



	  May be 0 to disable the extra delay and solely use the device level

	  runtime pm autosuspend delay tunable.



config DRM_I915_SPIN_REQUEST

	int

	int "Busywait for request completion (us)"

	default 5 # microseconds

	help

	  Before sleeping waiting for a request (GPU operation) to complete,

drivers/gpu/drm/i915/Makefile

+90 −69
Original line number Diff line number Diff line
@@ -44,14 +44,16 @@ i915-y += i915_drv.o \ 
	  i915_irq.o \

	  i915_params.o \

	  i915_pci.o \

	  i915_scatterlist.o \

	  i915_suspend.o \

	  i915_sysfs.o \

	  intel_csr.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 += \
@@ -62,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)
@@ -85,27 +87,41 @@ gt-$(CONFIG_DRM_I915_SELFTEST) += \ 
i915-y += $(gt-y)



# GEM (Graphics Execution Management) code

obj-y += gem/

gem-y += \

	gem/i915_gem_busy.o \

	gem/i915_gem_clflush.o \

	gem/i915_gem_client_blt.o \

	gem/i915_gem_context.o \

	gem/i915_gem_dmabuf.o \

	gem/i915_gem_domain.o \

	gem/i915_gem_execbuffer.o \

	gem/i915_gem_fence.o \

	gem/i915_gem_internal.o \

	gem/i915_gem_object.o \

	gem/i915_gem_object_blt.o \

	gem/i915_gem_mman.o \

	gem/i915_gem_pages.o \

	gem/i915_gem_phys.o \

	gem/i915_gem_pm.o \

	gem/i915_gem_shmem.o \

	gem/i915_gem_shrinker.o \

	gem/i915_gem_stolen.o \

	gem/i915_gem_throttle.o \

	gem/i915_gem_tiling.o \

	gem/i915_gem_userptr.o \

	gem/i915_gem_wait.o \

	gem/i915_gemfs.o

i915-y += \

	  $(gem-y) \

	  i915_active.o \

	  i915_cmd_parser.o \

	  i915_gem_batch_pool.o \

	  i915_gem_clflush.o \

	  i915_gem_context.o \

	  i915_gem_dmabuf.o \

	  i915_gem_evict.o \

	  i915_gem_execbuffer.o \

	  i915_gem_fence_reg.o \

	  i915_gem_gtt.o \

	  i915_gem_internal.o \

	  i915_gem.o \

	  i915_gem_object.o \

	  i915_gem_pm.o \

	  i915_gem_render_state.o \

	  i915_gem_shrinker.o \

	  i915_gem_stolen.o \

	  i915_gem_tiling.o \

	  i915_gem_userptr.o \

	  i915_gemfs.o \

	  i915_globals.o \

	  i915_query.o \

	  i915_request.o \
@@ -134,66 +150,74 @@ 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_cdclk.o \

	  intel_color.o \

	  intel_combo_phy.o \

	  intel_connector.o \

	  intel_display.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

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

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

i915-$(CONFIG_DRM_I915_SELFTEST) += \

	gem/selftests/igt_gem_utils.o \

	selftests/i915_random.o \

	selftests/i915_selftest.o \

	selftests/igt_flush_test.o \

	selftests/igt_gem_utils.o \

	selftests/igt_live_test.o \

	selftests/igt_reset.o \

	selftests/igt_spinner.o
@@ -223,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