Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

Pull drm updates from Dave Airlie:
 "This is the main git pull for the drm,

  I pretty much froze major pulls at -rc5/6 time, and haven't had much
  fallout, so will probably continue doing that.

  Lots of changes all over, big internal header cleanup to make it clear
  drm features are legacy things and what are things that modern KMS
  drivers should be using.  Also big move to use the new generic fences
  in all the TTM drivers.

  core:
        atomic prep work,
        vblank rework changes, allows immediate vblank disables
        major header reworking and cleanups to better delinate legacy
        interfaces from what KMS drivers should be using.
        cursor planes locking fixes

  ttm:
        move to generic fences (affects all TTM drivers)
        ppc64 caching fixes

  radeon:
        userptr support,
        uvd for old asics,
        reset rework for fence changes
        better buffer placement changes,
        dpm feature enablement
        hdmi audio support fixes

  intel:
        Cherryview work,
        180 degree rotation,
        skylake prep work,
        execlist command submission
        full ppgtt prep work
        cursor improvements
        edid caching,
        vdd handling improvements

  nouveau:
        fence reworking
        kepler memory clock work
        gt21x clock work
        fan control improvements
        hdmi infoframe fixes
        DP audio

  ast:
        ppc64 fixes
        caching fix

  rcar:
        rcar-du DT support

  ipuv3:
        prep work for capture support

  msm:
        LVDS support for mdp4, new panel, gpu refactoring

  exynos:
        exynos3250 SoC support, drop bad mmap interface,
        mipi dsi changes, and component match support"

* 'drm-next' of git://people.freedesktop.org/~airlied/linux: (640 commits)
  drm/mst: rework payload table allocation to conform better.
  drm/ast: Fix HW cursor image
  drm/radeon/kv: add uvd/vce info to dpm debugfs output
  drm/radeon/ci: add uvd/vce info to dpm debugfs output
  drm/radeon: export reservation_object from dmabuf to ttm
  drm/radeon: cope with foreign fences inside the reservation object
  drm/radeon: cope with foreign fences inside display
  drm/core: use helper to check driver features
  drm/radeon/cik: write gfx ucode version to ucode addr reg
  drm/radeon/si: print full CS when we hit a packet 0
  drm/radeon: remove unecessary includes
  drm/radeon/combios: declare legacy_connector_convert as static
  drm/radeon/atombios: declare connector convert tables as static
  drm/radeon: drop btc_get_max_clock_from_voltage_dependency_table
  drm/radeon/dpm: drop clk/voltage dependency filters for BTC
  drm/radeon/dpm: drop clk/voltage dependency filters for CI
  drm/radeon/dpm: drop clk/voltage dependency filters for SI
  drm/radeon/dpm: drop clk/voltage dependency filters for NI
  drm/radeon: disable audio when we disable hdmi (v2)
  drm/radeon: split audio enable between eg and r600 (v2)
  ...

1 files changed, 59 insertions, 24 deletions

diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c
index f475414671d8..9b584f3fbb99 100644
--- a/drivers/gpu/drm/i915/intel_fbdev.c
+++ b/drivers/gpu/drm/i915/intel_fbdev.c
@@ -24,8 +24,10 @@
  *     David Airlie
  */
 
+#include <linux/async.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
+#include <linux/console.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
@@ -331,24 +333,6 @@ static bool intel_fb_initial_config(struct drm_fb_helper *fb_helper,
         int num_connectors_enabled = 0;
         int num_connectors_detected = 0;
 
-        /*
-         * If the user specified any force options, just bail here
-         * and use that config.
-         */
-        for (i = 0; i < fb_helper->connector_count; i++) {
-                struct drm_fb_helper_connector *fb_conn;
-                struct drm_connector *connector;
-
-                fb_conn = fb_helper->connector_info[i];
-                connector = fb_conn->connector;
-
-                if (!enabled[i])
-                        continue;
-
-                if (connector->force != DRM_FORCE_UNSPECIFIED)
-                        return false;
-        }
-
         save_enabled = kcalloc(dev->mode_config.num_connector, sizeof(bool),
                                GFP_KERNEL);
         if (!save_enabled)
@@ -374,8 +358,18 @@ static bool intel_fb_initial_config(struct drm_fb_helper *fb_helper,
                         continue;
                 }
 
+                if (connector->force == DRM_FORCE_OFF) {
+                        DRM_DEBUG_KMS("connector %s is disabled by user, skipping\n",
+                                      connector->name);
+                        enabled[i] = false;
+                        continue;
+                }
+
                 encoder = connector->encoder;
                 if (!encoder || WARN_ON(!encoder->crtc)) {
+                        if (connector->force > DRM_FORCE_OFF)
+                                goto bail;
+
                         DRM_DEBUG_KMS("connector %s has no encoder or crtc, skipping\n",
                                       connector->name);
                         enabled[i] = false;
@@ -394,8 +388,7 @@ static bool intel_fb_initial_config(struct drm_fb_helper *fb_helper,
                 for (j = 0; j < fb_helper->connector_count; j++) {
                         if (crtcs[j] == new_crtc) {
                                 DRM_DEBUG_KMS("fallback: cloned configuration\n");
-                                fallback = true;
-                                goto out;
+                                goto bail;
                         }
                 }
 
@@ -466,8 +459,8 @@ static bool intel_fb_initial_config(struct drm_fb_helper *fb_helper,
                 fallback = true;
         }
 
-out:
         if (fallback) {
+bail:
                 DRM_DEBUG_KMS("Not using firmware configuration\n");
                 memcpy(enabled, save_enabled, dev->mode_config.num_connector);
                 kfree(save_enabled);
@@ -636,6 +629,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;
@@ -662,14 +664,16 @@ 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;
 }
 
-void intel_fbdev_initial_config(struct drm_device *dev)
+void intel_fbdev_initial_config(void *data, async_cookie_t cookie)
 {
-        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_i915_private *dev_priv = data;
         struct intel_fbdev *ifbdev = dev_priv->fbdev;
 
         /* Due to peculiar init order wrt to hpd handling this is separate. */
@@ -682,12 +686,15 @@ void intel_fbdev_fini(struct drm_device *dev)
         if (!dev_priv->fbdev)
                 return;
 
+        flush_work(&dev_priv->fbdev_suspend_work);
+
+        async_synchronize_full();
         intel_fbdev_destroy(dev, dev_priv->fbdev);
         kfree(dev_priv->fbdev);
         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;
@@ -698,6 +705,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.
+                 */
+                WARN_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.
@@ -706,6 +740,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)