22 files changed, 1627 insertions, 292 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 707163365a93..90e7e226a90c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2373,10 +2373,10 @@ F:	drivers/gpu/drm/
 F:      include/drm/
 
 INTEL DRM DRIVERS (excluding Poulsbo, Moorestown and derivative chipsets)
-M:      Keith Packard <keithp@keithp.com>
+M:      Daniel Vetter <daniel.vetter@ffwll.ch>
 L:      intel-gfx@lists.freedesktop.org (subscribers-only)
 L:      dri-devel@lists.freedesktop.org
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux.git
+T:      git git://people.freedesktop.org/~danvet/drm-intel
 S:      Supported
 F:      drivers/gpu/drm/i915
 F:      include/drm/i915*
diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c
index 74c2d9274c53..764f70c5e690 100644
--- a/drivers/char/agp/intel-agp.c
+++ b/drivers/char/agp/intel-agp.c
@@ -908,6 +908,10 @@ static struct pci_device_id agp_intel_pci_table[] = {
         ID(PCI_DEVICE_ID_INTEL_IVYBRIDGE_M_HB),
         ID(PCI_DEVICE_ID_INTEL_IVYBRIDGE_S_HB),
         ID(PCI_DEVICE_ID_INTEL_VALLEYVIEW_HB),
+        ID(PCI_DEVICE_ID_INTEL_HASWELL_HB),
+        ID(PCI_DEVICE_ID_INTEL_HASWELL_M_HB),
+        ID(PCI_DEVICE_ID_INTEL_HASWELL_S_HB),
+        ID(PCI_DEVICE_ID_INTEL_HASWELL_E_HB),
         { }
 };
 
diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
index 8b8bbc70f86b..0ca7f7646ab5 100644
--- a/drivers/gpu/drm/i915/Makefile
+++ b/drivers/gpu/drm/i915/Makefile
@@ -19,6 +19,7 @@ i915-y := i915_drv.o i915_dma.o i915_irq.o \
           intel_crt.o \
           intel_lvds.o \
           intel_bios.o \
+          intel_ddi.o \
           intel_dp.o \
           intel_hdmi.o \
           intel_sdvo.o \
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 950f72a0d729..eb2b3c25b9e1 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -699,6 +699,7 @@ static int i915_error_state(struct seq_file *m, void *unused)
         struct drm_device *dev = error_priv->dev;
         drm_i915_private_t *dev_priv = dev->dev_private;
         struct drm_i915_error_state *error = error_priv->error;
+        struct intel_ring_buffer *ring;
         int i, j, page, offset, elt;
 
         if (!error) {
@@ -706,7 +707,6 @@ static int i915_error_state(struct seq_file *m, void *unused)
                 return 0;
         }
 
-
         seq_printf(m, "Time: %ld s %ld us\n", error->time.tv_sec,
                    error->time.tv_usec);
         seq_printf(m, "PCI ID: 0x%04x\n", dev->pci_device);
@@ -722,11 +722,8 @@ static int i915_error_state(struct seq_file *m, void *unused)
                 seq_printf(m, "DONE_REG: 0x%08x\n", error->done_reg);
         }
 
-        i915_ring_error_state(m, dev, error, RCS);
-        if (HAS_BLT(dev))
-                i915_ring_error_state(m, dev, error, BCS);
-        if (HAS_BSD(dev))
-                i915_ring_error_state(m, dev, error, VCS);
+        for_each_ring(ring, dev_priv, i)
+                i915_ring_error_state(m, dev, error, i);
 
         if (error->active_bo)
                 print_error_buffers(m, "Active",
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index 42d91e841629..f94792626b94 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -980,10 +980,10 @@ static int i915_getparam(struct drm_device *dev, void *data,
                 value = 1;
                 break;
         case I915_PARAM_HAS_BSD:
-                value = HAS_BSD(dev);
+                value = intel_ring_initialized(&dev_priv->ring[VCS]);
                 break;
         case I915_PARAM_HAS_BLT:
-                value = HAS_BLT(dev);
+                value = intel_ring_initialized(&dev_priv->ring[BCS]);
                 break;
         case I915_PARAM_HAS_RELAXED_FENCING:
                 value = 1;
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 77b7a50e2014..d3e194853061 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -345,6 +345,13 @@ static const struct pci_device_id pciidlist[] = {		/* aka */
         INTEL_VGA_DEVICE(0x0162, &intel_ivybridge_d_info), /* GT2 desktop */
         INTEL_VGA_DEVICE(0x015a, &intel_ivybridge_d_info), /* GT1 server */
         INTEL_VGA_DEVICE(0x016a, &intel_ivybridge_d_info), /* GT2 server */
+        INTEL_VGA_DEVICE(0x0402, &intel_haswell_d_info), /* GT1 desktop */
+        INTEL_VGA_DEVICE(0x0412, &intel_haswell_d_info), /* GT2 desktop */
+        INTEL_VGA_DEVICE(0x040a, &intel_haswell_d_info), /* GT1 server */
+        INTEL_VGA_DEVICE(0x041a, &intel_haswell_d_info), /* GT2 server */
+        INTEL_VGA_DEVICE(0x0406, &intel_haswell_m_info), /* GT1 mobile */
+        INTEL_VGA_DEVICE(0x0416, &intel_haswell_m_info), /* GT2 mobile */
+        INTEL_VGA_DEVICE(0x0c16, &intel_haswell_d_info), /* SDV */
         {0, 0, 0}
 };
 
@@ -407,9 +414,11 @@ bool i915_semaphore_is_enabled(struct drm_device *dev)
         if (i915_semaphores >= 0)
                 return i915_semaphores;
 
+#ifdef CONFIG_INTEL_IOMMU
         /* Enable semaphores on SNB when IO remapping is off */
-        if (INTEL_INFO(dev)->gen == 6)
-                return !intel_iommu_enabled;
+        if (INTEL_INFO(dev)->gen == 6 && intel_iommu_gfx_mapped)
+                return false;
+#endif
 
         return 1;
 }
@@ -622,15 +631,16 @@ static int i915_drm_thaw(struct drm_device *dev)
 
         /* KMS EnterVT equivalent */
         if (drm_core_check_feature(dev, DRIVER_MODESET)) {
+                if (HAS_PCH_SPLIT(dev))
+                        ironlake_init_pch_refclk(dev);
+
                 mutex_lock(&dev->struct_mutex);
                 dev_priv->mm.suspended = 0;
 
                 error = i915_gem_init_hw(dev);
                 mutex_unlock(&dev->struct_mutex);
 
-                if (HAS_PCH_SPLIT(dev))
+                intel_modeset_init_hw(dev);