1 files changed, 44 insertions, 60 deletions

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
index be7d7fb1b44b..2582ffd36bb5 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
@@ -43,8 +43,6 @@ struct vmw_fb_par {
 
         struct mutex bo_mutex;
         struct vmw_dma_buffer *vmw_bo;
-        struct ttm_bo_kmap_obj map;
-        void *bo_ptr;
         unsigned bo_size;
         struct drm_framebuffer *set_fb;
         struct drm_display_mode *set_mode;
@@ -163,10 +161,17 @@ static int vmw_fb_blank(int blank, struct fb_info *info)
         return 0;
 }
 
-/*
- * Dirty code
+/**
+ * vmw_fb_dirty_flush - flush dirty regions to the kms framebuffer
+ *
+ * @work: The struct work_struct associated with this task.
+ *
+ * This function flushes the dirty regions of the vmalloc framebuffer to the
+ * kms framebuffer, and if the kms framebuffer is visible, also updated the
+ * corresponding displays. Note that this function runs even if the kms
+ * framebuffer is not bound to a crtc and thus not visible, but it's turned
+ * off during hibernation using the par->dirty.active bool.
  */
-
 static void vmw_fb_dirty_flush(struct work_struct *work)
 {
         struct vmw_fb_par *par = container_of(work, struct vmw_fb_par,
@@ -174,13 +179,15 @@ static void vmw_fb_dirty_flush(struct work_struct *work)
         struct vmw_private *vmw_priv = par->vmw_priv;
         struct fb_info *info = vmw_priv->fb_info;
         unsigned long irq_flags;
-        s32 dst_x1, dst_x2, dst_y1, dst_y2, w, h;
+        s32 dst_x1, dst_x2, dst_y1, dst_y2, w = 0, h = 0;
         u32 cpp, max_x, max_y;
         struct drm_clip_rect clip;
         struct drm_framebuffer *cur_fb;
         u8 *src_ptr, *dst_ptr;
+        struct vmw_dma_buffer *vbo = par->vmw_bo;
+        void *virtual;
 
-        if (vmw_priv->suspended)
+        if (!READ_ONCE(par->dirty.active))
                 return;
 
         mutex_lock(&par->bo_mutex);
@@ -188,10 +195,16 @@ static void vmw_fb_dirty_flush(struct work_struct *work)
         if (!cur_fb)
                 goto out_unlock;
 
+        (void) ttm_read_lock(&vmw_priv->reservation_sem, false);
+        (void) ttm_bo_reserve(&vbo->base, false, false, NULL);
+        virtual = vmw_dma_buffer_map_and_cache(vbo);
+        if (!virtual)
+                goto out_unreserve;
+
         spin_lock_irqsave(&par->dirty.lock, irq_flags);
         if (!par->dirty.active) {
                 spin_unlock_irqrestore(&par->dirty.lock, irq_flags);
-                goto out_unlock;
+                goto out_unreserve;
         }
 
         /*
@@ -221,7 +234,7 @@ static void vmw_fb_dirty_flush(struct work_struct *work)
         spin_unlock_irqrestore(&par->dirty.lock, irq_flags);
 
         if (w && h) {
-                dst_ptr = (u8 *)par->bo_ptr  +
+                dst_ptr = (u8 *)virtual  +
                         (dst_y1 * par->set_fb->pitches[0] + dst_x1 * cpp);
                 src_ptr = (u8 *)par->vmalloc +
                         ((dst_y1 + par->fb_y) * info->fix.line_length +
@@ -237,7 +250,12 @@ static void vmw_fb_dirty_flush(struct work_struct *work)
                 clip.x2 = dst_x2;
                 clip.y1 = dst_y1;
                 clip.y2 = dst_y2;
+        }
 
+out_unreserve:
+        ttm_bo_unreserve(&vbo->base);
+        ttm_read_unlock(&vmw_priv->reservation_sem);
+        if (w && h) {
                 WARN_ON_ONCE(par->set_fb->funcs->dirty(cur_fb, NULL, 0, 0,
                                                        &clip, 1));
                 vmw_fifo_flush(vmw_priv, false);
@@ -504,18 +522,8 @@ static int vmw_fb_kms_detach(struct vmw_fb_par *par,
                 par->set_fb = NULL;
         }
 
-        if (par->vmw_bo && detach_bo) {
-                struct vmw_private *vmw_priv = par->vmw_priv;
-
-                if (par->bo_ptr) {
-                        ttm_bo_kunmap(&par->map);
-                        par->bo_ptr = NULL;
-                }
-                if (unref_bo)
-                        vmw_dmabuf_unreference(&par->vmw_bo);
-                else if (vmw_priv->active_display_unit != vmw_du_legacy)
-                        vmw_dmabuf_unpin(par->vmw_priv, par->vmw_bo, false);
-        }
+        if (par->vmw_bo && detach_bo && unref_bo)
+                vmw_dmabuf_unreference(&par->vmw_bo);
 
         return 0;
 }
@@ -636,38 +644,6 @@ static int vmw_fb_set_par(struct fb_info *info)
         if (ret)
                 goto out_unlock;
 
-        if (!par->bo_ptr) {
-                struct vmw_framebuffer *vfb = vmw_framebuffer_to_vfb(set.fb);
-
-                /*
-                 * Pin before mapping. Since we don't know in what placement
-                 * to pin, call into KMS to do it for us.  LDU doesn't require
-                 * additional pinning because set_config() would've pinned
-                 * it already
-                 */
-                if (vmw_priv->active_display_unit != vmw_du_legacy) {
-                        ret = vfb->pin(vfb);
-                        if (ret) {
-                                DRM_ERROR("Could not pin the fbdev "
-                                          "framebuffer.\n");
-                                goto out_unlock;
-                        }
-                }
-
-                ret = ttm_bo_kmap(&par->vmw_bo->base, 0,
-                                  par->vmw_bo->base.num_pages, &par->map);
-                if (ret) {
-                        if (vmw_priv->active_display_unit != vmw_du_legacy)
-                                vfb->unpin(vfb);
-
-                        DRM_ERROR("Could not map the fbdev framebuffer.\n");
-                        goto out_unlock;
-                }
-
-                par->bo_ptr = ttm_kmap_obj_virtual(&par->map, &par->bo_iowrite);
-        }
-
-
         vmw_fb_dirty_mark(par, par->fb_x, par->fb_y,
                           par->set_fb->width, par->set_fb->height);
 
@@ -883,12 +859,6 @@ int vmw_fb_off(struct vmw_private *vmw_priv)
         flush_delayed_work(&info->deferred_work);
         flush_delayed_work(&par->local_work);
 
-        mutex_lock(&par->bo_mutex);
-        drm_modeset_lock_all(vmw_priv->dev);
-        (void) vmw_fb_kms_detach(par, true, false);
-        drm_modeset_unlock_all(vmw_priv->dev);
-        mutex_unlock(&par->bo_mutex);
-
         return 0;
 }
 
@@ -904,10 +874,24 @@ int vmw_fb_on(struct vmw_private *vmw_priv)
         info = vmw_priv->fb_info;
         par = info->par;
 
-        vmw_fb_set_par(info);
         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;
+
+        vmw_fb_set_par(vmw_priv->fb_info);
+}