2 files changed, 11 insertions, 4 deletions

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 0692622ee2b3..b293ef0bae71 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -68,9 +68,11 @@ static int i915_suspend(struct drm_device *dev, pm_message_t state)
         i915_save_state(dev);
 
         /* If KMS is active, we do the leavevt stuff here */
-        if (drm_core_check_feature(dev, DRIVER_MODESET) && i915_gem_idle(dev)) {
-                dev_err(&dev->pdev->dev, "GEM idle failed, aborting suspend\n");
-                return -EBUSY;
+        if (drm_core_check_feature(dev, DRIVER_MODESET)) {
+                if (i915_gem_idle(dev))
+                        dev_err(&dev->pdev->dev,
+                                "GEM idle failed, resume may fail\n");
+                drm_irq_uninstall(dev);
         }
 
         intel_opregion_free(dev);
@@ -108,6 +110,8 @@ static int i915_resume(struct drm_device *dev)
                 if (ret != 0)
                         ret = -1;
                 mutex_unlock(&dev->struct_mutex);
+
+                drm_irq_install(dev);
         }
 
         return ret;
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 25b337438ca7..e9882d0c2473 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -211,7 +211,7 @@ fast_user_write(struct io_mapping *mapping,
 
         vaddr_atomic = io_mapping_map_atomic_wc(mapping, page_base);
         unwritten = __copy_from_user_inatomic_nocache(vaddr_atomic + page_offset,
-                                                      user_data, length);
+                                                      user_data, length, length);
         io_mapping_unmap_atomic(vaddr_atomic);
         if (unwritten)
                 return -EFAULT;
@@ -1051,6 +1051,9 @@ i915_gem_retire_requests(struct drm_device *dev)
         drm_i915_private_t *dev_priv = dev->dev_private;
         uint32_t seqno;
 
+        if (!dev_priv->hw_status_page)
+                return;
+
         seqno = i915_get_gem_seqno(dev);
 
         while (!list_empty(&dev_priv->mm.request_list)) {