Merge tag 'drm-intel-next-2019-04-04' into gvt-next

[linux-2.6-microblaze.git] / drivers / gpu / drm / i915 / Makefile

diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
index 1787e12..30bf330 100644 (file)
--- a/drivers/gpu/drm/i915/Makefile
+++ b/drivers/gpu/drm/i915/Makefile
@@ -46,6 +46,7 @@ i915-y := i915_drv.o \
          i915_sw_fence.o \
          i915_syncmap.o \
          i915_sysfs.o \
+         i915_user_extensions.o \
          intel_csr.o \
          intel_device_info.o \
          intel_pm.o \
@@ -56,6 +57,17 @@ i915-$(CONFIG_COMPAT)   += i915_ioc32.o
 i915-$(CONFIG_DEBUG_FS) += i915_debugfs.o intel_pipe_crc.o
 i915-$(CONFIG_PERF_EVENTS) += i915_pmu.o
 
+# Test the headers are compilable as standalone units
+i915-$(CONFIG_DRM_I915_WERROR) += \
+       test_i915_active_types_standalone.o \
+       test_i915_gem_context_types_standalone.o \
+       test_i915_priolist_types_standalone.o \
+       test_i915_scheduler_types_standalone.o \
+       test_i915_timeline_types_standalone.o \
+       test_intel_context_types_standalone.o \
+       test_intel_engine_types_standalone.o \
+       test_intel_workarounds_types_standalone.o
+
 # GEM code
 i915-y += \
          i915_active.o \
@@ -77,6 +89,7 @@ i915-y += \
          i915_gem_tiling.o \
          i915_gem_userptr.o \
          i915_gemfs.o \
+         i915_globals.o \
          i915_query.o \
          i915_request.o \
          i915_scheduler.o \
@@ -84,6 +97,7 @@ i915-y += \
          i915_trace_points.o \
          i915_vma.o \
          intel_breadcrumbs.o \
+         intel_context.o \
          intel_engine_cs.o \
          intel_hangcheck.o \
          intel_lrc.o \