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

Commit ff37c05a authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-next-2016-07-11' of git://anongit.freedesktop.org/drm-intel into drm-next 

- select igt testing depencies for CONFIG_DRM_I915_DEBUG (Chris)
- track outputs in crtc state and clean up all our ad-hoc connector/encoder
  walking in modest code (Ville)
- demidlayer drm_device/drm_i915_private (Chris Wilson)
- thundering herd fix from Chris Wilson, with lots of help from Tvrtko Ursulin
- piles of assorted clean and fallout from the thundering herd fix
- documentation and more tuning for waitboosting (Chris)
- pooled EU support on bxt (Arun Siluvery)
- bxt support is no longer considered prelimary!
- ring/engine vfunc cleanup from Tvrtko
- introduce intel_wait_for_register helper (Chris)
- opregion updates (Jani Nukla)
- tuning and fixes for wait_for macros (Tvrkto&Imre)
- more kabylake pci ids (Rodrigo)
- pps cleanup and fixes for bxt (Imre)
- move sink crc support over to atomic state (Maarten)
- fix up async fbdev init ordering (Chris)
- fbc fixes from Paulo and Chris

* tag 'drm-intel-next-2016-07-11' of git://anongit.freedesktop.org/drm-intel: (223 commits)
  drm/i915: Update DRIVER_DATE to 20160711
  drm/i915: Select DRM_VGEM for igt
  drm/i915: Select X86_MSR for igt
  drm/i915: Fill unused GGTT with scratch pages for VT-d
  drm/i915: Introduce Kabypoint PCH for Kabylake H/DT.
  drm/i915:gen9: implement WaMediaPoolStateCmdInWABB
  drm/i915: Check for invalid cloning earlier during modeset
  drm/i915: Simplify hdmi_12bpc_possible()
  drm/i915: Kill has_dsi_encoder
  drm/i915: s/INTEL_OUTPUT_DISPLAYPORT/INTEL_OUTPUT_DP/
  drm/i915: Replace some open coded intel_crtc_has_dp_encoder()s
  drm/i915: Kill has_dp_encoder from pipe_config
  drm/i915: Replace manual lvds and sdvo/hdmi counting with intel_crtc_has_type()
  drm/i915: Unify intel_pipe_has_type() and intel_pipe_will_have_type()
  drm/i915: Add output_types bitmask into the crtc state
  drm/i915: Remove encoder type checks from MST suspend/resume
  drm/i915: Don't mark eDP encoders as MST capable
  drm/i915: avoid wait_for_atomic() in non-atomic host2guc_action()
  drm/i915: Group the irq breadcrumb variables into the same cacheline
  drm/i915: Wake up the bottom-half if we steal their interrupt
  ...
parents 6c181c82 0b2c0582

drivers/gpu/drm/i915/Kconfig.debug

+3 −0
Original line number Diff line number Diff line
@@ -18,6 +18,9 @@ config DRM_I915_WERROR 
config DRM_I915_DEBUG

        bool "Enable additional driver debugging"

        depends on DRM_I915

        select PREEMPT_COUNT

        select X86_MSR # used by igt/pm_rpm

        select DRM_VGEM # used by igt/prime_vgem (dmabuf interop checks)

        default n

        help

          Choose this option to turn on extra driver debugging that may affect

drivers/gpu/drm/i915/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -10,9 +10,11 @@ subdir-ccflags-$(CONFIG_DRM_I915_WERROR) := -Werror 
i915-y := i915_drv.o \

	  i915_irq.o \

	  i915_params.o \

	  i915_pci.o \

          i915_suspend.o \

	  i915_sysfs.o \

	  intel_csr.o \

	  intel_device_info.o \

	  intel_pm.o \

	  intel_runtime_pm.o
@@ -37,6 +39,7 @@ i915-y += i915_cmd_parser.o \ 
	  i915_gem_userptr.o \

	  i915_gpu_error.o \

	  i915_trace_points.o \

	  intel_breadcrumbs.o \

	  intel_lrc.o \

	  intel_mocs.o \

	  intel_ringbuffer.o \
@@ -101,9 +104,6 @@ i915-y += dvo_ch7017.o \ 
# virtual gpu code

i915-y += i915_vgpu.o



# legacy horrors

i915-y += i915_dma.o



ifeq ($(CONFIG_DRM_I915_GVT),y)

i915-y += intel_gvt.o

include $(src)/gvt/Makefile

drivers/gpu/drm/i915/i915_debugfs.c

+188 −212

File changed.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/i915/i915_dma.c

deleted100644 → 0
+0 −1692

File deleted.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/i915/i915_drv.c

+1407 −604

File changed.

Preview size limit exceeded, changes collapsed.