Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next

Conflicts:
	drivers/gpu/drm/i915/Makefile

Makefile cleanup in drm-intel-next conflicts with a build-fix to move
intel_opregion under CONFIG_ACPI.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

diff --cc drivers/gpu/drm/i915/Makefile
index 077e81b,f33902f..b1445b7
--- 1/drivers/gpu/drm/i915/Makefile
--- 2/drivers/gpu/drm/i915/Makefile
+++ b/drivers/gpu/drm/i915/Makefile
@@@ -23,50 -12,49 +23,49 @@@ i915-y += i915_cmd_parser.o 
          i915_gem_evict.o \
          i915_gem_execbuffer.o \
          i915_gem_gtt.o \
 +        i915_gem.o \
          i915_gem_stolen.o \
          i915_gem_tiling.o \
 -        i915_params.o \
 -        i915_sysfs.o \
 +        i915_gpu_error.o \
 +        i915_irq.o \
          i915_trace_points.o \
 -        i915_ums.o \
 +        intel_ringbuffer.o \
 +        intel_uncore.o
 +
 +# modesetting core code
 +i915-y += intel_bios.o \
          intel_display.o \
 -        intel_crt.o \
 -        intel_lvds.o \
 -        intel_dsi.o \
 -        intel_dsi_cmd.o \
 -        intel_dsi_pll.o \
 -        intel_bios.o \
 -        intel_ddi.o \
 -        intel_dp.o \
 -        intel_hdmi.o \
 -        intel_sdvo.o \
          intel_modes.o \
-         intel_opregion.o \
 -        intel_panel.o \
 -        intel_pm.o \
 -        intel_i2c.o \
 -        intel_tv.o \
 -        intel_dvo.o \
 -        intel_ringbuffer.o \
          intel_overlay.o \
 -        intel_sprite.o \
          intel_sideband.o \
 -        intel_uncore.o \
 +        intel_sprite.o
- i915-$(CONFIG_ACPI)           += intel_acpi.o
++i915-$(CONFIG_ACPI)           += intel_acpi.o intel_opregion.o
 +i915-$(CONFIG_DRM_I915_FBDEV) += intel_fbdev.o
 +
 +# modesetting output/encoder code
 +i915-y += dvo_ch7017.o \
          dvo_ch7xxx.o \
 -        dvo_ch7017.o \
          dvo_ivch.o \
 -        dvo_tfp410.o \
 -        dvo_sil164.o \
          dvo_ns2501.o \
 -        i915_gem_dmabuf.o
 -
 -i915-$(CONFIG_COMPAT)   += i915_ioc32.o
 -
 -i915-$(CONFIG_ACPI)   += intel_acpi.o intel_opregion.o
 -
 -i915-$(CONFIG_DRM_I915_FBDEV) += intel_fbdev.o
 +        dvo_sil164.o \
 +        dvo_tfp410.o \
 +        intel_crt.o \
 +        intel_ddi.o \
 +        intel_dp.o \
 +        intel_dsi_cmd.o \
 +        intel_dsi.o \
 +        intel_dsi_pll.o \
 +        intel_dvo.o \
 +        intel_hdmi.o \
 +        intel_i2c.o \
 +        intel_lvds.o \
 +        intel_panel.o \
 +        intel_sdvo.o \
 +        intel_tv.o
  
 -i915-$(CONFIG_DEBUG_FS) += i915_debugfs.o
 +# legacy horrors
 +i915-y += i915_dma.o \
 +        i915_ums.o
  
  obj-$(CONFIG_DRM_I915)  += i915.o
  

diff --cc drivers/gpu/drm/i915/i915_drv.h
Simple merge

diff --cc drivers/gpu/drm/i915/i915_gem_gtt.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_gpu_error.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_irq.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_display.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_dp.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_ringbuffer.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_ringbuffer.h
Simple merge