22 files changed, 1847 insertions, 126 deletions

diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c
index b3cd3ebae077..96f958d8cd45 100644
--- a/arch/x86/kernel/early-quirks.c
+++ b/arch/x86/kernel/early-quirks.c
@@ -313,6 +313,16 @@ static size_t __init gen6_stolen_size(int num, int slot, int func)
         return gmch_ctrl << 25; /* 32 MB units */
 }
 
+static inline size_t gen8_stolen_size(int num, int slot, int func)
+{
+        u16 gmch_ctrl;
+
+        gmch_ctrl = read_pci_config_16(num, slot, func, SNB_GMCH_CTRL);
+        gmch_ctrl >>= BDW_GMCH_GMS_SHIFT;
+        gmch_ctrl &= BDW_GMCH_GMS_MASK;
+        return gmch_ctrl << 25; /* 32 MB units */
+}
+
 typedef size_t (*stolen_size_fn)(int num, int slot, int func);
 
 static struct pci_device_id intel_stolen_ids[] __initdata = {
@@ -336,6 +346,8 @@ static struct pci_device_id intel_stolen_ids[] __initdata = {
         INTEL_IVB_D_IDS(gen6_stolen_size),
         INTEL_HSW_D_IDS(gen6_stolen_size),
         INTEL_HSW_M_IDS(gen6_stolen_size),
+        INTEL_BDW_M_IDS(gen8_stolen_size),
+        INTEL_BDW_D_IDS(gen8_stolen_size)
 };
 
 static void __init intel_graphics_stolen(int num, int slot, int func)
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 43866221cd4c..6ed45a984230 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -586,7 +586,53 @@ static int i915_interrupt_info(struct seq_file *m, void *data)
         if (ret)
                 return ret;
 
-        if (IS_VALLEYVIEW(dev)) {
+        if (INTEL_INFO(dev)->gen >= 8) {
+                int i;
+                seq_printf(m, "Master Interrupt Control:\t%08x\n",
+                           I915_READ(GEN8_MASTER_IRQ));
+
+                for (i = 0; i < 4; i++) {
+                        seq_printf(m, "GT Interrupt IMR %d:\t%08x\n",
+                                   i, I915_READ(GEN8_GT_IMR(i)));
+                        seq_printf(m, "GT Interrupt IIR %d:\t%08x\n",
+                                   i, I915_READ(GEN8_GT_IIR(i)));
+                        seq_printf(m, "GT Interrupt IER %d:\t%08x\n",
+                                   i, I915_READ(GEN8_GT_IER(i)));
+                }
+
+                for_each_pipe(i) {
+                        seq_printf(m, "Pipe %c IMR:\t%08x\n",
+                                   pipe_name(i),
+                                   I915_READ(GEN8_DE_PIPE_IMR(i)));
+                        seq_printf(m, "Pipe %c IIR:\t%08x\n",
+                                   pipe_name(i),
+                                   I915_READ(GEN8_DE_PIPE_IIR(i)));
+                        seq_printf(m, "Pipe %c IER:\t%08x\n",
+                                   pipe_name(i),
+                                   I915_READ(GEN8_DE_PIPE_IER(i)));
+                }
+
+                seq_printf(m, "Display Engine port interrupt mask:\t%08x\n",
+                           I915_READ(GEN8_DE_PORT_IMR));
+                seq_printf(m, "Display Engine port interrupt identity:\t%08x\n",
+                           I915_READ(GEN8_DE_PORT_IIR));
+                seq_printf(m, "Display Engine port interrupt enable:\t%08x\n",
+                           I915_READ(GEN8_DE_PORT_IER));
+
+                seq_printf(m, "Display Engine misc interrupt mask:\t%08x\n",
+                           I915_READ(GEN8_DE_MISC_IMR));
+                seq_printf(m, "Display Engine misc interrupt identity:\t%08x\n",
+                           I915_READ(GEN8_DE_MISC_IIR));
+                seq_printf(m, "Display Engine misc interrupt enable:\t%08x\n",
+                           I915_READ(GEN8_DE_MISC_IER));
+
+                seq_printf(m, "PCU interrupt mask:\t%08x\n",
+                           I915_READ(GEN8_PCU_IMR));
+                seq_printf(m, "PCU interrupt identity:\t%08x\n",
+                           I915_READ(GEN8_PCU_IIR));
+                seq_printf(m, "PCU interrupt enable:\t%08x\n",
+                           I915_READ(GEN8_PCU_IER));
+        } else if (IS_VALLEYVIEW(dev)) {
                 seq_printf(m, "Display IER:\t%08x\n",
                            I915_READ(VLV_IER));
                 seq_printf(m, "Display IIR:\t%08x\n",
@@ -658,7 +704,7 @@ static int i915_interrupt_info(struct seq_file *m, void *data)
         seq_printf(m, "Interrupts received: %d\n",
                    atomic_read(&dev_priv->irq_received));
         for_each_ring(ring, dev_priv, i) {
-                if (IS_GEN6(dev) || IS_GEN7(dev)) {
+                if (INTEL_INFO(dev)->gen >= 6) {
                         seq_printf(m,
                                    "Graphics Interrupt mask (%s):       %08x\n",
                                    ring->name, I915_READ_IMR(ring));
@@ -1577,7 +1623,7 @@ static int i915_swizzle_info(struct seq_file *m, void *data)
                            I915_READ16(C0DRB3));
                 seq_printf(m, "C1DRB3 = 0x%04x\n",
                            I915_READ16(C1DRB3));
-        } else if (IS_GEN6(dev) || IS_GEN7(dev)) {
+        } else if (INTEL_INFO(dev)->gen >= 6) {
                 seq_printf(m, "MAD_DIMM_C0 = 0x%08x\n",
                            I915_READ(MAD_DIMM_C0));
                 seq_printf(m, "MAD_DIMM_C1 = 0x%08x\n",
@@ -1586,8 +1632,12 @@ static int i915_swizzle_info(struct seq_file *m, void *data)
                            I915_READ(MAD_DIMM_C2));
                 seq_printf(m, "TILECTL = 0x%08x\n",
                            I915_READ(TILECTL));
-                seq_printf(m, "ARB_MODE = 0x%08x\n",
-                           I915_READ(ARB_MODE));
+                if (IS_GEN8(dev))
+                        seq_printf(m, "GAMTARBMODE = 0x%08x\n",
+                                   I915_READ(GAMTARBMODE));
+                else
+                        seq_printf(m, "ARB_MODE = 0x%08x\n",
+                                   I915_READ(ARB_MODE));
                 seq_printf(m, "DISP_ARB_CTL = 0x%08x\n",
                            I915_READ(DISP_ARB_CTL));
         }
@@ -1596,18 +1646,37 @@ static int i915_swizzle_info(struct seq_file *m, void *data)
         return 0;
 }
 
-static int i915_ppgtt_info(struct seq_file *m, void *data)
+static void gen8_ppgtt_info(struct seq_file *m, struct drm_device *dev)
 {
-        struct drm_info_node *node = (struct drm_info_node *) m->private;
-        struct drm_device *dev = node->minor->dev;
         struct drm_i915_private *dev_priv = dev->dev_private;
         struct intel_ring_buffer *ring;
-        int i, ret;
+        struct i915_hw_ppgtt *ppgtt = dev_priv->mm.aliasing_ppgtt;
+        int unused, i;
 
+        if (!ppgtt)