Merge tag 'v3.16-rc1' into i2c/for-next

[karo-tx-linux.git] / drivers / gpu / drm / i915 / Makefile

diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
index b1445b73465be0642aa0904df983183f0ae42135..cad1683d8bb527cc3c5e3fe9b163d581ff42ec53 100644 (file)
--- a/drivers/gpu/drm/i915/Makefile
+++ b/drivers/gpu/drm/i915/Makefile
@@ -18,6 +18,7 @@ i915-$(CONFIG_DEBUG_FS) += i915_debugfs.o
 # GEM code
 i915-y += i915_cmd_parser.o \
          i915_gem_context.o \
+         i915_gem_render_state.o \
          i915_gem_debug.o \
          i915_gem_dmabuf.o \
          i915_gem_evict.o \
@@ -26,12 +27,18 @@ i915-y += i915_cmd_parser.o \
          i915_gem.o \
          i915_gem_stolen.o \
          i915_gem_tiling.o \
+         i915_gem_userptr.o \
          i915_gpu_error.o \
          i915_irq.o \
          i915_trace_points.o \
          intel_ringbuffer.o \
          intel_uncore.o
 
+# autogenerated null render state
+i915-y += intel_renderstate_gen6.o \
+         intel_renderstate_gen7.o \
+         intel_renderstate_gen8.o
+
 # modesetting core code
 i915-y += intel_bios.o \
          intel_display.o \
@@ -55,6 +62,7 @@ i915-y += dvo_ch7017.o \
          intel_dsi_cmd.o \
          intel_dsi.o \
          intel_dsi_pll.o \
+         intel_dsi_panel_vbt.o \
          intel_dvo.o \
          intel_hdmi.o \
          intel_i2c.o \