On Wed, Aug 13, 2014 at 01:09:46PM +0100, Chris Wilson wrote:
> 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 <ch...@chris-wilson.co.uk>
> Cc: Daniel Vetter <daniel.vet...@ffwll.ch>
> ---
> drivers/gpu/drm/i915/i915_dma.c | 3 ---
> drivers/gpu/drm/i915/i915_drv.c | 28 ++-----------------------
> drivers/gpu/drm/i915/i915_drv.h | 9 +-------
> drivers/gpu/drm/i915/intel_drv.h | 4 ++--
> drivers/gpu/drm/i915/intel_fbdev.c | 42
> +++++++++++++++++++++++++++++++++++++-
> 5 files changed, 46 insertions(+), 40 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
> index 860da759ae34..fbab9370cb5c 100644
> --- a/drivers/gpu/drm/i915/i915_dma.c
> +++ b/drivers/gpu/drm/i915/i915_dma.c
> @@ -1339,8 +1339,6 @@ static int i915_load_modeset_init(struct drm_device
> *dev)
> if (ret)
> goto cleanup_irq;
>
> - INIT_WORK(&dev_priv->console_resume_work, intel_console_resume);
> -
> intel_modeset_gem_init(dev);
>
> /* Always safe in the mode setting case. */
> @@ -1857,7 +1855,6 @@ int i915_driver_unload(struct drm_device *dev)
> if (drm_core_check_feature(dev, DRIVER_MODESET)) {
> intel_fbdev_fini(dev);
> intel_modeset_cleanup(dev);
> - cancel_work_sync(&dev_priv->console_resume_work);
This one here seems to have been lost - shouldn't we move this to
fbdev_fini instead? Otherwise this looks good imo, so I'll fix that up
while merging if you're ok.
-Daniel
>
> /*
> * free the memory space allocated for the child device
> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> index 35b119072c11..7c7bb94d7654 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;
> @@ -683,17 +669,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;
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index 19aa07b8d5dd..00f343116aad 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -1601,14 +1601,9 @@ struct drm_i915_private {
> #ifdef CONFIG_DRM_I915_FBDEV
> /* list of fbdev register on this device */
> struct intel_fbdev *fbdev;
> + struct work_struct fbdev_suspend_work;
> #endif
>
> - /*
> - * The console may be contended at resume, but we don't
> - * want it to block on it.
> - */
> - struct work_struct console_resume_work;
> -
> struct drm_property *broadcast_rgb_property;
> struct drm_property *force_audio_property;
>
> @@ -2308,8 +2303,6 @@ extern unsigned long i915_gfx_val(struct
> drm_i915_private *dev_priv);
> extern void i915_update_gfx_val(struct drm_i915_private *dev_priv);
> int vlv_force_gfx_clock(struct drm_i915_private *dev_priv, bool on);
>
> -extern void intel_console_resume(struct work_struct *work);
> -
> /* i915_irq.c */
> void i915_queue_hangcheck(struct drm_device *dev);
> __printf(3, 4)
> diff --git a/drivers/gpu/drm/i915/intel_drv.h
> b/drivers/gpu/drm/i915/intel_drv.h
> index feb16c730d91..ffc9288ce3f3 100644
> --- a/drivers/gpu/drm/i915/intel_drv.h
> +++ b/drivers/gpu/drm/i915/intel_drv.h
> @@ -960,7 +960,7 @@ void intel_dvo_init(struct drm_device *dev);
> extern int intel_fbdev_init(struct drm_device *dev);
> extern void intel_fbdev_initial_config(struct drm_device *dev);
> extern void intel_fbdev_fini(struct drm_device *dev);
> -extern void intel_fbdev_set_suspend(struct drm_device *dev, int state);
> +extern void intel_fbdev_set_suspend(struct drm_device *dev, int state, bool
> synchronous);
> extern void intel_fbdev_output_poll_changed(struct drm_device *dev);
> extern void intel_fbdev_restore_mode(struct drm_device *dev);
> #else
> @@ -977,7 +977,7 @@ static inline void intel_fbdev_fini(struct drm_device
> *dev)
> {
> }
>
> -static inline void intel_fbdev_set_suspend(struct drm_device *dev, int state)
> +static inline void intel_fbdev_set_suspend(struct drm_device *dev, int
> state, bool synchronous)
> {
> }
>
> diff --git a/drivers/gpu/drm/i915/intel_fbdev.c
> b/drivers/gpu/drm/i915/intel_fbdev.c
> index 5d879d185fe1..5352b170b7bb 100644
> --- a/drivers/gpu/drm/i915/intel_fbdev.c
> +++ b/drivers/gpu/drm/i915/intel_fbdev.c
> @@ -26,6 +26,7 @@
>
> #include <linux/module.h>
> #include <linux/kernel.h>
> +#include <linux/console.h>
> #include <linux/errno.h>
> #include <linux/string.h>
> #include <linux/mm.h>
> @@ -627,6 +628,15 @@ out:
> return false;
> }
>
> +static void intel_fbdev_suspend_worker(struct work_struct *work)
> +{
> + intel_fbdev_set_suspend(container_of(work,
> + struct drm_i915_private,
> + fbdev_suspend_work)->dev,
> + FBINFO_STATE_RUNNING,
> + true);
> +}
> +
> int intel_fbdev_init(struct drm_device *dev)
> {
> struct intel_fbdev *ifbdev;
> @@ -653,6 +663,8 @@ int intel_fbdev_init(struct drm_device *dev)
> }
>
> dev_priv->fbdev = ifbdev;
> + INIT_WORK(&dev_priv->fbdev_suspend_work, intel_fbdev_suspend_worker);
> +
> drm_fb_helper_single_add_all_connectors(&ifbdev->helper);
>
> return 0;
> @@ -678,7 +690,7 @@ void intel_fbdev_fini(struct drm_device *dev)
> dev_priv->fbdev = NULL;
> }
>
> -void intel_fbdev_set_suspend(struct drm_device *dev, int state)
> +void intel_fbdev_set_suspend(struct drm_device *dev, int state, bool
> synchronous)
> {
> struct drm_i915_private *dev_priv = dev->dev_private;
> struct intel_fbdev *ifbdev = dev_priv->fbdev;
> @@ -689,6 +701,33 @@ void intel_fbdev_set_suspend(struct drm_device *dev, int
> state)
>
> info = ifbdev->helper.fbdev;
>
> + if (synchronous) {
> + /* Flush any pending work to turn the console on, and then
> + * wait to turn it off. It must be synchronous as we are
> + * about to suspend or unload the driver.
> + *
> + * Note that from within the work-handler, we cannot flush
> + * ourselves, so only flush outstanding work upon suspend!
> + */
> + if (state != FBINFO_STATE_RUNNING)
> + flush_work(&dev_priv->fbdev_suspend_work);
> + console_lock();
> + } else {
> + /*
> + * 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.
> + */
> + BUG_ON(state != FBINFO_STATE_RUNNING);
> + if (!console_trylock()) {
> + /* Don't block our own workqueue as this can
> + * be run in parallel with other i915.ko tasks.
> + */
> + schedule_work(&dev_priv->fbdev_suspend_work);
> + return;
> + }
> + }
> +
> /* On resume from hibernation: If the object is shmemfs backed, it has
> * been restored from swap. If the object is stolen however, it will be
> * full of whatever garbage was left in there.
> @@ -697,6 +736,7 @@ void intel_fbdev_set_suspend(struct drm_device *dev, int
> state)
> memset_io(info->screen_base, 0, info->screen_size);
>
> fb_set_suspend(info, state);
> + console_unlock();
> }
>
> void intel_fbdev_output_poll_changed(struct drm_device *dev)
> --
> 2.1.0.rc1
>
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
