6 files changed, 58 insertions, 46 deletions

diff --git a/drivers/gpu/drm/rcar-du/rcar_lvds.c b/drivers/gpu/drm/rcar-du/rcar_lvds.c
index 3d2d3bbd1342..155ad840f3c5 100644
--- a/drivers/gpu/drm/rcar-du/rcar_lvds.c
+++ b/drivers/gpu/drm/rcar-du/rcar_lvds.c
@@ -88,6 +88,9 @@ static int rcar_lvds_connector_atomic_check(struct drm_connector *connector,
         const struct drm_display_mode *panel_mode;
         struct drm_crtc_state *crtc_state;
 
+        if (!state->crtc)
+                return 0;
+
         if (list_empty(&connector->modes)) {
                 dev_dbg(lvds->dev, "connector: empty modes list\n");
                 return -EINVAL;
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
index 70e1a8820a7c..8b770a8e02cd 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
@@ -1278,8 +1278,6 @@ static void vmw_master_drop(struct drm_device *dev,
         dev_priv->active_master = &dev_priv->fbdev_master;
         ttm_lock_set_kill(&dev_priv->fbdev_master.lock, false, SIGTERM);
         ttm_vt_unlock(&dev_priv->fbdev_master.lock);
-
-        vmw_fb_refresh(dev_priv);
 }
 
 /**
@@ -1483,7 +1481,6 @@ static int vmw_pm_freeze(struct device *kdev)
                         vmw_kms_resume(dev);
                 if (dev_priv->enable_fb)
                         vmw_fb_on(dev_priv);
-                vmw_fb_refresh(dev_priv);
                 return -EBUSY;
         }
 
@@ -1523,8 +1520,6 @@ static int vmw_pm_restore(struct device *kdev)
         if (dev_priv->enable_fb)
                 vmw_fb_on(dev_priv);
 
-        vmw_fb_refresh(dev_priv);
-
         return 0;
 }
 
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
index f34f368c1a2e..5fcbe1620d50 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
@@ -910,7 +910,6 @@ int vmw_fb_init(struct vmw_private *vmw_priv);
 int vmw_fb_close(struct vmw_private *dev_priv);
 int vmw_fb_off(struct vmw_private *vmw_priv);
 int vmw_fb_on(struct vmw_private *vmw_priv);
-void vmw_fb_refresh(struct vmw_private *vmw_priv);
 
 /**
  * Kernel modesetting - vmwgfx_kms.c
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
index ba0cdb743c3e..54e300365a5c 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
@@ -866,21 +866,13 @@ int vmw_fb_on(struct vmw_private *vmw_priv)
         spin_lock_irqsave(&par->dirty.lock, flags);
         par->dirty.active = true;
         spin_unlock_irqrestore(&par->dirty.lock, flags);
- 
-        return 0;
-}
 
-/**
- * vmw_fb_refresh - Refresh fb display
- *
- * @vmw_priv: Pointer to device private
- *
- * Call into kms to show the fbdev display(s).
- */
-void vmw_fb_refresh(struct vmw_private *vmw_priv)
-{
-        if (!vmw_priv->fb_info)
-                return;
+        /*
+         * Need to reschedule a dirty update, because otherwise that's
+         * only done in dirty_mark() if the previous coalesced
+         * dirty region was empty.
+         */
+        schedule_delayed_work(&par->local_work, 0);
 
-        vmw_fb_set_par(vmw_priv->fb_info);
+        return 0;
 }
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_msg.c b/drivers/gpu/drm/vmwgfx/vmwgfx_msg.c
index cdff99211602..21d746bdc922 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_msg.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_msg.c
@@ -329,8 +329,6 @@ int vmw_host_get_guestinfo(const char *guest_info_param,
         struct rpc_channel channel;
         char *msg, *reply = NULL;
         size_t reply_len = 0;
-        int ret = 0;
-
 
         if (!vmw_msg_enabled)
                 return -ENODEV;
@@ -344,15 +342,14 @@ int vmw_host_get_guestinfo(const char *guest_info_param,
                 return -ENOMEM;
         }
 
-        if (vmw_open_channel(&channel, RPCI_PROTOCOL_NUM) ||
-            vmw_send_msg(&channel, msg) ||
-            vmw_recv_msg(&channel, (void *) &reply, &reply_len) ||
-            vmw_close_channel(&channel)) {
-                DRM_ERROR("Failed to get %s", guest_info_param);
+        if (vmw_open_channel(&channel, RPCI_PROTOCOL_NUM))
+                goto out_open;
 
-                ret = -EINVAL;
-        }
+        if (vmw_send_msg(&channel, msg) ||
+            vmw_recv_msg(&channel, (void *) &reply, &reply_len))
+                goto out_msg;
 
+        vmw_close_channel(&channel);
         if (buffer && reply && reply_len > 0) {
                 /* Remove reply code, which are the first 2 characters of
                  * the reply
@@ -369,7 +366,17 @@ int vmw_host_get_guestinfo(const char *guest_info_param,
         kfree(reply);
         kfree(msg);
 
-        return ret;
+        return 0;
+
+out_msg:
+        vmw_close_channel(&channel);
+        kfree(reply);
+out_open:
+        *length = 0;
+        kfree(msg);
+        DRM_ERROR("Failed to get %s", guest_info_param);
+
+        return -EINVAL;
 }
 
 
@@ -400,15 +407,22 @@ int vmw_host_log(const char *log)
                 return -ENOMEM;
         }
 
-        if (vmw_open_channel(&channel, RPCI_PROTOCOL_NUM) ||
-            vmw_send_msg(&channel, msg) ||
-            vmw_close_channel(&channel)) {
-                DRM_ERROR("Failed to send log\n");
+        if (vmw_open_channel(&channel, RPCI_PROTOCOL_NUM))
+                goto out_open;
 
-                ret = -EINVAL;
-        }
+        if (vmw_send_msg(&channel, msg))
+                goto out_msg;
 
+        vmw_close_channel(&channel);
         kfree(msg);
 
-        return ret;
+        return 0;
+
+out_msg:
+        vmw_close_channel(&channel);
+out_open:
+        kfree(msg);
+        DRM_ERROR("Failed to send log\n");
+
+        return -EINVAL;
 }
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_msg.h b/drivers/gpu/drm/vmwgfx/vmwgfx_msg.h
index 557a033fb610..8545488aa0cf 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_msg.h
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_msg.h
@@ -135,17 +135,24 @@
 
 #else
 
-/* In the 32-bit version of this macro, we use "m" because there is no
- * more register left for bp
+/*
+ * In the 32-bit version of this macro, we store bp in a memory location
+ * because we've ran out of registers.
+ * Now we can't reference that memory location while we've modified
+ * %esp or %ebp, so we first push it on the stack, just before we push
+ * %ebp, and then when we need it we read it from the stack where we
+ * just pushed it.
  */
 #define VMW_PORT_HB_OUT(cmd, in_ecx, in_si, in_di,      \
                         port_num, magic, bp,            \
                         eax, ebx, ecx, edx, si, di)     \
 ({                                                      \
-        asm volatile ("push %%ebp;"                     \
-                "mov %12, %%ebp;"                       \
+        asm volatile ("push %12;"                       \
+                "push %%ebp;"                           \
+                "mov 0x04(%%esp), %%ebp;"               \
                 "rep outsb;"                            \
-                "pop %%ebp;" :                          \
+                "pop %%ebp;"                            \
+                "add $0x04, %%esp;" :                   \
                 "=a"(eax),                              \
                 "=b"(ebx),                              \
                 "=c"(ecx),                              \
@@ -167,10 +174,12 @@
                        port_num, magic, bp,             \
                        eax, ebx, ecx, edx, si, di)      \
 ({                                                      \
-        asm volatile ("push %%ebp;"                     \
-                "mov %12, %%ebp;"                       \
+        asm volatile ("push %12;"                       \
+                "push %%ebp;"                           \
+                "mov 0x04(%%esp), %%ebp;"               \
                 "rep insb;"                             \
-                "pop %%ebp" :                           \
+                "pop %%ebp;"                            \
+                "add $0x04, %%esp;" :                   \
                 "=a"(eax),                              \
                 "=b"(ebx),                              \
                 "=c"(ecx),                              \