Merge drm/drm-next into drm-intel-gt-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 7df74a7..024b69b 100644 (file)
--- a/drivers/gpu/drm/i915/Makefile
+++ b/drivers/gpu/drm/i915/Makefile
@@ -33,6 +33,7 @@ subdir-ccflags-y += -I$(srctree)/$(src)
 
 # core driver code
 i915-y += i915_driver.o \
+         i915_drm_client.o \
          i915_config.o \
          i915_getparam.o \
          i915_ioctl.o \
@@ -106,6 +107,8 @@ gt-y += \
        gt/intel_gt_pm_debugfs.o \
        gt/intel_gt_pm_irq.o \
        gt/intel_gt_requests.o \
+       gt/intel_gt_sysfs.o \
+       gt/intel_gt_sysfs_pm.o \
        gt/intel_gtt.o \
        gt/intel_llc.o \
        gt/intel_lrc.o \
@@ -125,6 +128,8 @@ gt-y += \
        gt/intel_workarounds.o \
        gt/shmem_utils.o \
        gt/sysfs_engines.o
+# x86 intel-gtt module support
+gt-$(CONFIG_X86) += gt/intel_gt_gmch.o
 # autogenerated null render state
 gt-y += \
        gt/gen6_renderstate.o \
@@ -185,9 +190,11 @@ i915-y += gt/uc/intel_uc.o \
          gt/uc/intel_uc_fw.o \
          gt/uc/intel_guc.o \
          gt/uc/intel_guc_ads.o \
+         gt/uc/intel_guc_capture.o \
          gt/uc/intel_guc_ct.o \
          gt/uc/intel_guc_debugfs.o \
          gt/uc/intel_guc_fw.o \
+         gt/uc/intel_guc_hwconfig.o \
          gt/uc/intel_guc_log.o \
          gt/uc/intel_guc_log_debugfs.o \
          gt/uc/intel_guc_rc.o \