Merge tag 'vmwgfx-next-15-08-21' of git://people.freedesktop.org/~thomash/linux into drm-next

Pull request of 15-08-21

The third pull request for 4.3. Contains two fixes for regressions introduced
with previous pull requests.

* tag 'vmwgfx-next-15-08-21' of git://people.freedesktop.org/~thomash/linux:
  drm/vmwgfx: Remove duplicate ttm_bo_device_release
  drm/vmwgfx: Fix a circular locking dependency in the fbdev code

2 files changed, 17 insertions, 13 deletions

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
index f97ec5686cbc..03854d606d58 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
@@ -965,7 +965,6 @@ static int vmw_driver_unload(struct drm_device *dev)
         ttm_object_device_release(&dev_priv->tdev);
         iounmap(dev_priv->mmio_virt);
         arch_phys_wc_del(dev_priv->mmio_mtrr);
-        (void)ttm_bo_device_release(&dev_priv->bdev);
         if (dev_priv->ctx.staged_bindings)
                 vmw_binding_state_free(dev_priv->ctx.staged_bindings);
         vmw_ttm_global_release(dev_priv);
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
index 042c5b4c706c..3b1faf7862a5 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
@@ -68,8 +68,7 @@ struct vmw_fb_par {
 
         struct drm_crtc *crtc;
         struct drm_connector *con;
-
-        bool local_mode;
+        struct delayed_work local_work;
 };
 
 static int vmw_fb_setcolreg(unsigned regno, unsigned red, unsigned green,
@@ -167,8 +166,10 @@ static int vmw_fb_blank(int blank, struct fb_info *info)
  * Dirty code
  */
 
-static void vmw_fb_dirty_flush(struct vmw_fb_par *par)
+static void vmw_fb_dirty_flush(struct work_struct *work)
 {
+        struct vmw_fb_par *par = container_of(work, struct vmw_fb_par,
+                                              local_work.work);
         struct vmw_private *vmw_priv = par->vmw_priv;
         struct fb_info *info = vmw_priv->fb_info;
         unsigned long irq_flags;
@@ -248,7 +249,6 @@ static void vmw_fb_dirty_mark(struct vmw_fb_par *par,
                               unsigned x1, unsigned y1,
                               unsigned width, unsigned height)
 {
-        struct fb_info *info = par->vmw_priv->fb_info;
         unsigned long flags;
         unsigned x2 = x1 + width;
         unsigned y2 = y1 + height;
@@ -262,7 +262,8 @@ static void vmw_fb_dirty_mark(struct vmw_fb_par *par,
                 /* if we are active start the dirty work
                  * we share the work with the defio system */
                 if (par->dirty.active)
-                        schedule_delayed_work(&info->deferred_work, VMW_DIRTY_DELAY);
+                        schedule_delayed_work(&par->local_work,
+                                              VMW_DIRTY_DELAY);
         } else {
                 if (x1 < par->dirty.x1)
                         par->dirty.x1 = x1;
@@ -326,9 +327,14 @@ static void vmw_deferred_io(struct fb_info *info,
                 par->dirty.x2 = info->var.xres;
                 par->dirty.y2 = y2;
                 spin_unlock_irqrestore(&par->dirty.lock, flags);
-        }
 
-        vmw_fb_dirty_flush(par);
+                /*
+                 * Since we've already waited on this work once, try to
+                 * execute asap.
+                 */
+                cancel_delayed_work(&par->local_work);
+                schedule_delayed_work(&par->local_work, 0);
+        }
 };
 
 static struct fb_deferred_io vmw_defio = {
@@ -601,11 +607,7 @@ static int vmw_fb_set_par(struct fb_info *info)
         /* If there already was stuff dirty we wont
          * schedule a new work, so lets do it now */
 
-#if (defined(VMWGFX_STANDALONE) && defined(VMWGFX_FB_DEFERRED))
-        schedule_delayed_work(&par->def_par.deferred_work, 0);
-#else
-        schedule_delayed_work(&info->deferred_work, 0);
-#endif
+        schedule_delayed_work(&par->local_work, 0);
 
 out_unlock:
         if (old_mode)
@@ -662,6 +664,7 @@ int vmw_fb_init(struct vmw_private *vmw_priv)
         vmw_priv->fb_info = info;
         par = info->par;
         memset(par, 0, sizeof(*par));
+        INIT_DELAYED_WORK(&par->local_work, &vmw_fb_dirty_flush);
         par->vmw_priv = vmw_priv;
         par->vmalloc = NULL;
         par->max_width = fb_width;
@@ -784,6 +787,7 @@ int vmw_fb_close(struct vmw_private *vmw_priv)
 
         /* ??? order */
         fb_deferred_io_cleanup(info);
+        cancel_delayed_work_sync(&par->local_work);
         unregister_framebuffer(info);
 
         (void) vmw_fb_kms_detach(par, true, true);
@@ -811,6 +815,7 @@ int vmw_fb_off(struct vmw_private *vmw_priv)
         spin_unlock_irqrestore(&par->dirty.lock, flags);
 
         flush_delayed_work(&info->deferred_work);
+        flush_delayed_work(&par->local_work);
 
         mutex_lock(&par->bo_mutex);
         (void) vmw_fb_kms_detach(par, true, false);