18 files changed, 140 insertions, 119 deletions

diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 2909b123baf5..359f6e8b9b00 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -676,6 +676,7 @@ static void i915_ring_error_state(struct seq_file *m,
         seq_printf(m, "  INSTPM: 0x%08x\n", error->instpm[ring]);
         seq_printf(m, "  FADDR: 0x%08x\n", error->faddr[ring]);
         if (INTEL_INFO(dev)->gen >= 6) {
+                seq_printf(m, "  RC PSMI: 0x%08x\n", error->rc_psmi[ring]);
                 seq_printf(m, "  FAULT_REG: 0x%08x\n", error->fault_reg[ring]);
                 seq_printf(m, "  SYNC_0: 0x%08x\n",
                            error->semaphore_mboxes[ring][0]);
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index f64ef4b723fd..9cf7dfe022b9 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -1781,7 +1781,13 @@ void i915_driver_lastclose(struct drm_device * dev)
 {
         drm_i915_private_t *dev_priv = dev->dev_private;
 
-        if (!dev_priv || drm_core_check_feature(dev, DRIVER_MODESET)) {
+        /* On gen6+ we refuse to init without kms enabled, but then the drm core
+         * goes right around and calls lastclose. Check for this and don't clean
+         * up anything. */
+        if (!dev_priv)
+                return;
+
+        if (drm_core_check_feature(dev, DRIVER_MODESET)) {
                 intel_fb_restore_mode(dev);
                 vga_switcheroo_process_delayed_switch();
                 return;
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 476c64c4844c..627fe35781b4 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -190,6 +190,7 @@ struct drm_i915_error_state {
         u32 instdone[I915_NUM_RINGS];
         u32 acthd[I915_NUM_RINGS];
         u32 semaphore_mboxes[I915_NUM_RINGS][I915_NUM_RINGS - 1];
+        u32 rc_psmi[I915_NUM_RINGS]; /* sleep state */
         /* our own tracking of ring head and tail */
         u32 cpu_ring_head[I915_NUM_RINGS];
         u32 cpu_ring_tail[I915_NUM_RINGS];
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 0fdb3d29cbbb..5c4657a54f97 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -2003,6 +2003,7 @@ static int __wait_seqno(struct intel_ring_buffer *ring, u32 seqno,
         }
 
         switch (end) {
+        case -EIO:
         case -EAGAIN: /* Wedged */
         case -ERESTARTSYS: /* Signal */
                 return (int)end;
@@ -3726,6 +3727,22 @@ void i915_gem_init_ppgtt(struct drm_device *dev)
         }
 }
 
+static bool
+intel_enable_blt(struct drm_device *dev)
+{
+        if (!HAS_BLT(dev))
+                return false;
+
+        /* The blitter was dysfunctional on early prototypes */
+        if (IS_GEN6(dev) && dev->pdev->revision < 8) {
+                DRM_INFO("BLT not supported on this pre-production hardware;"
+                         " graphics performance will be degraded.\n");
+                return false;
+        }
+
+        return true;
+}
+
 int
 i915_gem_init_hw(struct drm_device *dev)
 {
@@ -3749,7 +3766,7 @@ i915_gem_init_hw(struct drm_device *dev)
                         goto cleanup_render_ring;
         }
 
-        if (HAS_BLT(dev)) {
+        if (intel_enable_blt(dev)) {
                 ret = intel_init_blt_ring_buffer(dev);
                 if (ret)
                         goto cleanup_bsd_ring;
diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c
index 9ae3f2cf414e..da8b01fb1bf8 100644
--- a/drivers/gpu/drm/i915/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/i915_gem_context.c
@@ -112,8 +112,8 @@ static int get_context_size(struct drm_device *dev)
                 ret = GEN6_CXT_TOTAL_SIZE(reg) * 64;
                 break;
         case 7:
-                reg = I915_READ(GEN7_CTX_SIZE);
-                ret = GEN7_CTX_TOTAL_SIZE(reg) * 64;
+                reg = I915_READ(GEN7_CXT_SIZE);
+                ret = GEN7_CXT_TOTAL_SIZE(reg) * 64;
                 break;
         default:
                 BUG();
@@ -374,6 +374,17 @@ static int do_switch(struct drm_i915_gem_object *from_obj,
         if (ret)
                 return ret;
 
+        /* Clear this page out of any CPU caches for coherent swap-in/out. Note
+         * that thanks to write = false in this call and us not setting any gpu
+         * write domains when putting a context object onto the active list
+         * (when switching away from it), this won't block.
+         * XXX: We need a real interface to do this instead of trickery. */
+        ret = i915_gem_object_set_to_gtt_domain(to->obj, false);
+        if (ret) {
+                i915_gem_object_unpin(to->obj);
+                return ret;
+        }
+
         if (!to->obj->has_global_gtt_mapping)
                 i915_gem_gtt_bind_object(to->obj, to->obj->cache_level);
 
@@ -408,8 +419,11 @@ static int do_switch(struct drm_i915_gem_object *from_obj,
                 from_obj->dirty = 1;
                 BUG_ON(from_obj->ring != to->ring);
                 i915_gem_object_unpin(from_obj);
+
+                drm_gem_object_unreference(&from_obj->base);
         }
 
+        drm_gem_object_reference(&to->obj->base);
         ring->last_context_obj = to->obj;
         to->is_initialized = true;
 
@@ -459,20 +473,7 @@ int i915_switch_context(struct intel_ring_buffer *ring,
         if (from_obj == to->obj)
                 return 0;
 
-        ret = do_switch(from_obj, to, i915_gem_next_request_seqno(to->ring));
-        if (ret)
-                return ret;
-
-        /* Just to make the code a little cleaner we take the object reference
-         * after the switch was successful. It would be more intuitive to ref
-         * the 'to' object before the switch but we know the refcount must be >0
-         * if context_get() succeeded, and we hold struct mutex. So it's safe to
-         * do this here/now
-         */
-        drm_gem_object_reference(&to->obj->base);
-        if (from_obj != NULL)
-                drm_gem_object_unreference(&from_obj->base);
-        return ret;
+        return do_switch(from_obj, to, i915_gem_next_request_seqno(to->ring));
 }
 
 int i915_gem_context_create_ioctl(struct drm_device *dev, void *data,
@@ -496,11 +497,13 @@ int i915_gem_context_create_ioctl(struct drm_device *dev, void *data,
 
         ctx = create_hw_context(dev, file_priv);
         mutex_unlock(&dev->struct_mutex);
+        if (IS_ERR(ctx))
+                return PTR_ERR(ctx);
 
         args->ctx_id = ctx->id;
         DRM_DEBUG_DRIVER("HW context %d created\n", args->ctx_id);
 
-        return PTR_RET(ctx);
+        return 0;
 }
 
 int i915_gem_context_destroy_ioctl(struct drm_device *dev, void *data,
diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
index 88e2e114189c..5af631e788c8 100644
--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
@@ -885,11 +885,16 @@ i915_gem_execbuffer_move_to_gpu(struct intel_ring_buffer *ring,
                         return ret;
         }
 
-        /* Unconditionally invalidate gpu caches. */
-        ret = i915_gem_flush_ring(ring, I915_GEM_GPU_DOMAINS, 0);
+        /* Unconditionally invalidate gpu caches and ensure that we do flush
+         * any residual writes from the previous batch.
+         */
+        ret = i915_gem_flush_ring(ring,
+                                  I915_GEM_GPU_DOMAINS,
+                                  ring->gpu_caches_dirty ? I915_GEM_GPU_DOMAINS : 0);
         if (ret)
                 return ret;
 
+        ring->gpu_caches_dirty = false;
         return 0;
 }
 
@@ -1223,6 +1228,10 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data,
                 }
         }
 
+        ret = i915_switch_context(ring, file, ctx_id);
+        if (ret)
+                goto err;
+
         if (ring == &dev_priv->ring[RCS] &&
             mode != dev_priv->relative_constants_mode) {
                 ret = intel_ring_begin(ring, 4);
@@ -1244,10 +1253,6 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data,
                         goto err;
         }
 
-        ret = i915_switch_context(ring, file, ctx_id);
-        if (ret)
-                goto err;
-
         trace_i915_gem_ring_dispatch(ring, seqno);
 
         exec_start = batch_obj->gtt_offset + args->batch_start_offset;
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 05014bc20ee8..8a3828528b9d 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -1066,6 +1066,7 @@ static void i915_record_ring_state(struct drm_device *dev,
         struct drm_i915_private *dev_priv = dev->dev_private;
 
         if (INTEL_INFO(dev)->gen >= 6) {
+                error->rc_psmi[ring->id] = I915_READ(ring->mmio_base + 0x50);
                 error->fault_reg[ring->id] = I915_READ(RING_FAULT_REG(ring));
                 error->semaphore_mboxes[ring->id][0]
                         = I915_READ(RING_SYNC_0(ring->mmio_base));
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 1218069c7f66..acc99b21e0b6 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -690,10 +690,10 @@
 #define   GEN6_BLITTER_FBC_NOTIFY                       (1<<3)
 
 #define GEN6_BSD_SLEEP_PSMI_CONTROL     0x12050
-#define   GEN6_BSD_SLEEP_PSMI_CONTROL_RC_ILDL_MESSAGE_MODIFY_MASK       (1 << 16)
-#define   GEN6_BSD_SLEEP_PSMI_CONTROL_RC_ILDL_MESSAGE_DISABLE           (1 << 0)
-#define   GEN6_BSD_SLEEP_PSMI_CONTROL_RC_ILDL_MESSAGE_ENABLE            0
-#define   GEN6_BSD_SLEEP_PSMI_CONTROL_IDLE_INDICATOR                    (1 << 3)
+#define   GEN6_BSD_SLEEP_MSG_DISABLE    (1 << 0)
+#define   GEN6_BSD_SLEEP_FLUSH_DISABLE  (1 << 2)
+#define   GEN6_BSD_SLEEP_INDICATOR      (1 << 3)
+#define   GEN6_BSD_GO_INDICATOR         (1 << 4)
 
 #define GEN6_BSD_HWSTAM                 0x12098
 #define GEN6_BSD_IMR                    0x120a8
@@ -1482,15 +1482,19 @@
                                         GEN6_CXT_RENDER_SIZE(cxt_reg) + \
                                         GEN6_CXT_EXTENDED_SIZE(cxt_reg) + \
                                         GEN6_CXT_PIPELINE_SIZE(cxt_reg))
-#define GEN7_CTX_SIZE           0x21a8
-#define GEN7_CTX_RENDER_SIZE(ctx_reg)   ((ctx_reg >> 16) & 0x3f)
-#define GEN7_CTX_EXTENDED_SIZE(ctx_reg) ((ctx_reg >> 9) & 0x7f)
-#define GEN7_CTX_GT1_SIZE(ctx_reg)      ((ctx_reg >> 6) & 0x7)
-#define GEN7_CTX_VFSTATE_SIZE(ctx_reg)  ((ctx_reg >> 0) & 0x3f)
-#define GEN7_CTX_TOTAL_SIZE(ctx_reg)    (GEN7_CTX_RENDER_SIZE(ctx_reg) + \
-                                         GEN7_CTX_EXTENDED_SIZE(ctx_reg) + \
-                                         GEN7_CTX_GT1_SIZE(ctx_reg) + \
-                                         GEN7_CTX_VFSTATE_SIZE(ctx_reg))
+#define GEN7_CXT_SIZE           0x21a8
+#define GEN7_CXT_POWER_SIZE(ctx_reg)    ((ctx_reg >> 25) & 0x7f)
+#define GEN7_CXT_RING_SIZE(ctx_reg)     ((ctx_reg >> 22) & 0x7)
+#define GEN7_CXT_RENDER_SIZE(ctx_reg)   ((ctx_reg >> 16) & 0x3f)
+#define GEN7_CXT_EXTENDED_SIZE(ctx_reg) ((ctx_reg >> 9) & 0x7f)
+#define GEN7_CXT_GT1_SIZE(ctx_reg)      ((ctx_reg >> 6) & 0x7)
+#define GEN7_CXT_VFSTATE_SIZE(ctx_reg)  ((ctx_reg >> 0) & 0x3f)
+#define GEN7_CXT_TOTAL_SIZE(ctx_reg)    (GEN7_CXT_POWER_SIZE(ctx_reg) + \
+                                         GEN7_CXT_RING_SIZE(ctx_reg) + \
+                                         GEN7_CXT_RENDER_SIZE(ctx_reg) + \
+                                         GEN7_CXT_EXTENDED_SIZE(ctx_reg) + \
+                                         GEN7_CXT_GT1_SIZE(ctx_reg) + \
+                                         GEN7_CXT_VFSTATE_SIZE(ctx_reg))
 
 /*
  * Overlay regs
@@ -1896,7 +1900,7 @@
 /* PCH CTL1 is totally different, all but the below bits are reserved. CTL2 is
  * like the normal CTL from gen4 and earlier. Hooray for confusing naming. */
 #define BLC_PWM_PCH_CTL1        0xc8250
-#define   BLM_PCH_PWM_ENABLE                    (1 << 30)
+#define   BLM_PCH_PWM_ENABLE                    (1 << 31)
 #define   BLM_PCH_OVERRIDE_ENABLE               (1 << 30)
 #define   BLM_PCH_POLARITY                      (1 << 29)
 #define BLC_PWM_PCH_CTL2        0xc8254
diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c
index 48e3b76e0ab2..7ed4a41c3965 100644
--- a/drivers/gpu/drm/i915/intel_crt.c
+++ b/drivers/gpu/drm/i915/intel_crt.c
@@ -330,39 +330,34 @@ static bool intel_crt_detect_ddc(struct drm_connector *connector)
 {
         struct intel_crt *crt = intel_attached_crt(connector);
         struct drm_i915_private *dev_priv = crt->base.base.dev->dev_private;
+        struct edid *edid;
+        struct i2c_adapter *i2c;
+
+        BUG_ON(crt->base.type != INTEL_OUTPUT_ANALOG);
 
-        /* CRT should always be at 0, but check anyway */
-        if (crt->base.type != INTEL_OUTPUT_ANALOG)
-                return false;
+        i2c = intel_gmbus_get_adapter(dev_priv, dev_priv->crt_ddc_pin);
+        edid = drm_get_edid(connector, i2c);
 
-        if (intel_ddc_probe(&crt->base, dev_priv->crt_ddc_pin)) {
-                struct edid *edid;
-                bool is_digital = false;
-                struct i2c_adapter *i2c;
+        if (edid) {
+                bool is_digital = edid->input & DRM_EDID_INPUT_DIGITAL;
 
-                i2c = intel_gmbus_get_adapter(dev_priv, dev_priv->crt_ddc_pin);
-                edid = drm_get_edid(connector, i2c);
                 /*
                  * This may be a DVI-I connector with a shared DDC
                  * link between analog and digital outputs, so we
                  * have to check the EDID input spec of the attached device.
-                 *
-                 * On the other hand, what should we do if it is a broken EDID?
                  */
-                if (edid != NULL) {
-                        is_digital = edid->input & DRM_EDID_INPUT_DIGITAL;
-                        connector->display_info.raw_edid = NULL;
-                        kfree(edid);
-                }
-
                 if (!is_digital) {
                         DRM_DEBUG_KMS("CRT detected via DDC:0x50 [EDID]\n");
                         return true;
-                } else {
-                        DRM_DEBUG_KMS("CRT not detected via DDC:0x50 [EDID reports a digital panel]\n");
                 }
+
+                DRM_DEBUG_KMS("CRT not detected via DDC:0x50 [EDID reports a digital panel]\n");
+        } else {
+                DRM_DEBUG_KMS("CRT not detected via DDC:0x50 [no valid EDID found]\n");
         }
 
+        kfree(edid);
+
         return false;
 }
 
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index bc25a24a08c5..f6159765f1eb 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -3573,7 +3573,7 @@ void intel_encoder_destroy(struct drm_encoder *encoder)
 }
 
 static bool intel_crtc_mode_fixup(struct drm_crtc *crtc,
-                                  struct drm_display_mode *mode,
+                                  const struct drm_display_mode *mode,
                                   struct drm_display_mode *adjusted_mode)
 {
         struct drm_device *dev = crtc->dev;
@@ -6486,7 +6486,9 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
         intel_fb = to_intel_framebuffer(fb);
         obj = intel_fb->obj;
 
-        mutex_lock(&dev->struct_mutex);
+        ret = i915_mutex_lock_interruptible(dev);
+        if (ret)
+                goto cleanup;
 
         /* Reference the objects for the scheduled work. */
         drm_gem_object_reference(&work->old_fb_obj->base);
@@ -6521,6 +6523,7 @@ cleanup_pending:
         drm_gem_object_unreference(&obj->base);
         mutex_unlock(&dev->struct_mutex);
 
+cleanup:
         spin_lock_irqsave(&dev->event_lock, flags);
         intel_crtc->unpin_work = NULL;
         spin_unlock_irqrestore(&dev->event_lock, flags);
@@ -7174,6 +7177,11 @@ static void i915_disable_vga(struct drm_device *dev)
 
 void intel_modeset_init_hw(struct drm_device *dev)
 {
+        /* We attempt to init the necessary power wells early in the initialization
+         * time, so the subsystems that expect power to be enabled can work.
+         */
+        intel_init_power_wells(dev);
+
         intel_prepare_ddi(dev);
 
         intel_init_clock_gating(dev);
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 2bc1505132c3..0a56b9ab0f58 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -1771,7 +1771,7 @@ intel_dp_start_link_train(struct intel_dp *intel_dp)
                 for (i = 0; i < intel_dp->lane_count; i++)
                         if ((intel_dp->train_set[i] & DP_TRAIN_MAX_SWING_REACHED) == 0)
                                 break;
-                if (i == intel_dp->lane_count) {
+                if (i == intel_dp->lane_count && voltage_tries == 5) {
                         ++loop_tries;
                         if (loop_tries == 5) {
                                 DRM_DEBUG_KMS("too many full retries, give up\n");
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index b7859e7110a7..84353559441c 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -342,7 +342,6 @@ struct intel_fbc_work {
 };
 
 int intel_ddc_get_modes(struct drm_connector *c, struct i2c_adapter *adapter);
-extern bool intel_ddc_probe(struct intel_encoder *intel_encoder, int ddc_bus);
 
 extern void intel_attach_force_audio_property(struct drm_connector *connector);
 extern void intel_attach_broadcast_rgb_property(struct drm_connector *connector);
@@ -496,6 +495,7 @@ extern void intel_update_fbc(struct drm_device *dev);
 extern void intel_gpu_ips_init(struct drm_i915_private *dev_priv);
 extern void intel_gpu_ips_teardown(void);
 
+extern void intel_init_power_wells(struct drm_device *dev);
 extern void intel_enable_gt_powersave(struct drm_device *dev);
 extern void intel_disable_gt_powersave(struct drm_device *dev);
 extern void gen6_gt_check_fifodbg(struct drm_i915_private *dev_priv);
diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
index 49f09a8b05e9..e05c0d3e3440 100644
--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/drivers/gpu/drm/i915/intel_lvds.c
@@ -409,13 +409,7 @@ static void intel_lvds_prepare(struct drm_encoder *encoder)
 {
         struct intel_lvds *intel_lvds = to_intel_lvds(encoder);
 
-        /*
-         * Prior to Ironlake, we must disable the pipe if we want to adjust
-         * the panel fitter. However at all other times we can just reset
-         * the registers regardless.
-         */
-        if (!HAS_PCH_SPLIT(encoder->dev) && intel_lvds->pfit_dirty)
-                intel_lvds_disable(intel_lvds);
+        intel_lvds_disable(intel_lvds);
 }
 
 static void intel_lvds_commit(struct drm_encoder *encoder)
diff --git a/drivers/gpu/drm/i915/intel_modes.c b/drivers/gpu/drm/i915/intel_modes.c
index d67ec3a51e42..45848b9b670b 100644
--- a/drivers/gpu/drm/i915/intel_modes.c
+++ b/drivers/gpu/drm/i915/intel_modes.c
@@ -33,34 +33,6 @@
 #include "i915_drv.h"
 
 /**
- * intel_ddc_probe
- *
- */
-bool intel_ddc_probe(struct intel_encoder *intel_encoder, int ddc_bus)
-{
-        struct drm_i915_private *dev_priv = intel_encoder->base.dev->dev_private;
-        u8 out_buf[] = { 0x0, 0x0};
-        u8 buf[2];
-        struct i2c_msg msgs[] = {
-                {
-                        .addr = DDC_ADDR,
-                        .flags = 0,
-                        .len = 1,
-                        .buf = out_buf,
-                },
-                {
-                        .addr = DDC_ADDR,
-                        .flags = I2C_M_RD,
-                        .len = 1,
-                        .buf = buf,
-                }
-        };
-
-        return i2c_transfer(intel_gmbus_get_adapter(dev_priv, ddc_bus),
-                            msgs, 2) == 2;
-}
-
-/**
  * intel_ddc_get_modes - get modelist from monitor
  * @connector: DRM connector device to use
  * @adapter: i2c adapter
diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c
index 58c7ee7238b8..10c7d39034e1 100644
--- a/drivers/gpu/drm/i915/intel_panel.c
+++ b/drivers/gpu/drm/i915/intel_panel.c
@@ -289,11 +289,17 @@ void intel_panel_disable_backlight(struct drm_device *dev)
         intel_panel_actually_set_backlight(dev, 0);
 
         if (INTEL_INFO(dev)->gen >= 4) {
-                uint32_t reg;
+                uint32_t reg, tmp;
 
                 reg = HAS_PCH_SPLIT(dev) ? BLC_PWM_CPU_CTL2 : BLC_PWM_CTL2;
 
                 I915_WRITE(reg, I915_READ(reg) & ~BLM_PWM_ENABLE);
+
+                if (HAS_PCH_SPLIT(dev)) {
+                        tmp = I915_READ(BLC_PWM_PCH_CTL1);
+                        tmp &= ~BLM_PCH_PWM_ENABLE;
+                        I915_WRITE(BLC_PWM_PCH_CTL1, tmp);
+                }
         }
 }
 
@@ -333,6 +339,13 @@ void intel_panel_enable_backlight(struct drm_device *dev,
                 I915_WRITE(reg, tmp);
                 POSTING_READ(reg);
                 I915_WRITE(reg, tmp | BLM_PWM_ENABLE);
+
+                if (HAS_PCH_SPLIT(dev)) {
+                        tmp = I915_READ(BLC_PWM_PCH_CTL1);
+                        tmp |= BLM_PCH_PWM_ENABLE;
+                        tmp &= ~BLM_PCH_OVERRIDE_ENABLE;
+                        I915_WRITE(BLC_PWM_PCH_CTL1, tmp);
+                }
         }
 }
 
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 0bb69fd255a9..94aabcaa3a67 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -2491,14 +2491,7 @@ static void gen6_enable_rps(struct drm_device *dev)
         gen6_set_rps(dev_priv->dev, (gt_perf_status & 0xff00) >> 8);
 
         /* requires MSI enabled */
-        I915_WRITE(GEN6_PMIER,
-                   GEN6_PM_MBOX_EVENT |
-                   GEN6_PM_THERMAL_EVENT |
-                   GEN6_PM_RP_DOWN_TIMEOUT |
-                   GEN6_PM_RP_UP_THRESHOLD |
-                   GEN6_PM_RP_DOWN_THRESHOLD |
-                   GEN6_PM_RP_UP_EI_EXPIRED |
-                   GEN6_PM_RP_DOWN_EI_EXPIRED);
+        I915_WRITE(GEN6_PMIER, GEN6_PM_DEFERRED_EVENTS);
         spin_lock_irq(&dev_priv->rps_lock);
         WARN_ON(dev_priv->pm_iir != 0);
         I915_WRITE(GEN6_PMIMR, 0);
@@ -3939,11 +3932,6 @@ void intel_init_pm(struct drm_device *dev)
                 else
                         dev_priv->display.get_fifo_size = i830_get_fifo_size;
         }
-
-        /* We attempt to init the necessary power wells early in the initialization
-         * time, so the subsystems that expect power to be enabled can work.
-         */
-        intel_init_power_wells(dev);
 }
 
 static void __gen6_gt_wait_for_thread_c0(struct drm_i915_private *dev_priv)
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index d42d821c64d6..bf0195a96d53 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -972,6 +972,7 @@ static int init_status_page(struct intel_ring_buffer *ring)
         ring->status_page.gfx_addr = obj->gtt_offset;
         ring->status_page.page_addr = kmap(obj->pages[0]);
         if (ring->status_page.page_addr == NULL) {
+                ret = -ENOMEM;
                 goto err_unpin;
         }
         ring->status_page.obj = obj;
@@ -1270,20 +1271,31 @@ static void gen6_bsd_ring_write_tail(struct intel_ring_buffer *ring,
         drm_i915_private_t *dev_priv = ring->dev->dev_private;
 
        /* Every tail move must follow the sequence below */
+
+        /* Disable notification that the ring is IDLE. The GT
+         * will then assume that it is busy and bring it out of rc6.
+         */
         I915_WRITE(GEN6_BSD_SLEEP_PSMI_CONTROL,
-                GEN6_BSD_SLEEP_PSMI_CONTROL_RC_ILDL_MESSAGE_MODIFY_MASK |
-                GEN6_BSD_SLEEP_PSMI_CONTROL_RC_ILDL_MESSAGE_DISABLE);
-        I915_WRITE(GEN6_BSD_RNCID, 0x0);
+                   _MASKED_BIT_ENABLE(GEN6_BSD_SLEEP_MSG_DISABLE));
 
+        /* Clear the context id. Here be magic! */
+        I915_WRITE64(GEN6_BSD_RNCID, 0x0);
+
+        /* Wait for the ring not to be idle, i.e. for it to wake up. */
         if (wait_for((I915_READ(GEN6_BSD_SLEEP_PSMI_CONTROL) &
-                GEN6_BSD_SLEEP_PSMI_CONTROL_IDLE_INDICATOR) == 0,
-                50))
-        DRM_ERROR("timed out waiting for IDLE Indicator\n");
+                      GEN6_BSD_SLEEP_INDICATOR) == 0,
+                     50))
+                DRM_ERROR("timed out waiting for the BSD ring to wake up\n");
 
+        /* Now that the ring is fully powered up, update the tail */
         I915_WRITE_TAIL(ring, value);
+        POSTING_READ(RING_TAIL(ring->mmio_base));
+
+        /* Let the ring send IDLE messages to the GT again,
+         * and so let it sleep to conserve power when idle.
+         */
         I915_WRITE(GEN6_BSD_SLEEP_PSMI_CONTROL,
-                GEN6_BSD_SLEEP_PSMI_CONTROL_RC_ILDL_MESSAGE_MODIFY_MASK |
-                GEN6_BSD_SLEEP_PSMI_CONTROL_RC_ILDL_MESSAGE_ENABLE);
+                   _MASKED_BIT_DISABLE(GEN6_BSD_SLEEP_MSG_DISABLE));
 }
 
 static int gen6_ring_flush(struct intel_ring_buffer *ring,
diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
index 1a1483b924d0..cc8df4de2d92 100644
--- a/drivers/gpu/drm/i915/intel_sprite.c
+++ b/drivers/gpu/drm/i915/intel_sprite.c
@@ -234,6 +234,7 @@ ilk_update_plane(struct drm_plane *plane, struct drm_framebuffer *fb,
         dvscntr &= ~DVS_PIXFORMAT_MASK;
         dvscntr &= ~DVS_RGB_ORDER_XBGR;
         dvscntr &= ~DVS_YUV_BYTE_ORDER_MASK;
+        dvscntr &= ~DVS_TILED;
 
         switch (fb->pixel_format) {
         case DRM_FORMAT_XBGR8888: