drm/i915: Localise the fbdev console lock frobbing

Rather than take and release the console_lock() around a non-existent
DRM_I915_FBDEV, move the lock acquisation into the callee where it will
be compiled out by the config option entirely. This includes moving the
deferred fb_set_suspend() dance and encapsulating it entirely within
intel_fbdev.c.

v2: Use an integral work item so that we can explicitly flush the work
upon suspend/unload.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
[danvet: Add the flush_work in fbdev_fini per the mailing list
discussion. And s/BUG_ON/WARN_ON/ because.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

1 files changed, 2 insertions, 26 deletions

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index ec96f9a9724c..01de97776d81 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -558,9 +558,7 @@ static int i915_drm_freeze(struct drm_device *dev)
         intel_uncore_forcewake_reset(dev, false);
         intel_opregion_fini(dev);
 
-        console_lock();
-        intel_fbdev_set_suspend(dev, FBINFO_STATE_SUSPENDED);
-        console_unlock();
+        intel_fbdev_set_suspend(dev, FBINFO_STATE_SUSPENDED, true);
 
         dev_priv->suspend_count++;
 
@@ -599,18 +597,6 @@ int i915_suspend(struct drm_device *dev, pm_message_t state)
         return 0;
 }
 
-void intel_console_resume(struct work_struct *work)
-{
-        struct drm_i915_private *dev_priv =
-                container_of(work, struct drm_i915_private,
-                             console_resume_work);
-        struct drm_device *dev = dev_priv->dev;
-
-        console_lock();
-        intel_fbdev_set_suspend(dev, FBINFO_STATE_RUNNING);
-        console_unlock();
-}
-
 static int i915_drm_thaw_early(struct drm_device *dev)
 {
         struct drm_i915_private *dev_priv = dev->dev_private;
@@ -681,17 +667,7 @@ static int __i915_drm_thaw(struct drm_device *dev, bool restore_gtt_mappings)
 
         intel_opregion_init(dev);
 
-        /*
-         * The console lock can be pretty contented on resume due
-         * to all the printk activity.  Try to keep it out of the hot
-         * path of resume if possible.
-         */
-        if (console_trylock()) {
-                intel_fbdev_set_suspend(dev, FBINFO_STATE_RUNNING);
-                console_unlock();
-        } else {
-                schedule_work(&dev_priv->console_resume_work);
-        }
+        intel_fbdev_set_suspend(dev, FBINFO_STATE_RUNNING, false);
 
         mutex_lock(&dev_priv->modeset_restore_lock);
         dev_priv->modeset_restore = MODESET_DONE;