summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_dma.c
diff options
context:
space:
mode:
authorJesse Barnes2014-05-28 23:39:03 +0200
committerDaniel Vetter2014-09-03 11:05:01 +0200
commitd1d70677e165826f3fa9966e1b7ec3765d7c0fb7 (patch)
tree7f20f811f16f6a873aa538fb1d7e9686d8e229ad /drivers/gpu/drm/i915/i915_dma.c
parentdrm/i915: Init some CHV workarounds via LRIs in ring->init_context() (diff)
downloadkernel-qcow2-linux-d1d70677e165826f3fa9966e1b7ec3765d7c0fb7.tar.gz
kernel-qcow2-linux-d1d70677e165826f3fa9966e1b7ec3765d7c0fb7.tar.xz
kernel-qcow2-linux-d1d70677e165826f3fa9966e1b7ec3765d7c0fb7.zip
drm/i915: make fbdev initialization asynchronous v2
This gets us out of our init code and out to userspace quite a bit faster, but does open us up to some bugs given the state of our init time locking. v2: switch to async_schedule (Chris) check with lockdep, seems happy (Jesse) move hotplug enable flag set to fbdev_initial_config (Jesse) Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> [danvet: Rebase on top of the dev_priv->enable_hotplug_processing removal.] Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_dma.c')
-rw-r--r--drivers/gpu/drm/i915/i915_dma.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index f19dbff0e73b..a58fed951ddb 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -28,6 +28,7 @@
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+#include <linux/async.h>
#include <drm/drmP.h>
#include <drm/drm_crtc_helper.h>
#include <drm/drm_fb_helper.h>
@@ -1375,7 +1376,7 @@ static int i915_load_modeset_init(struct drm_device *dev)
* scanning against hotplug events. Hence do this first and ignore the
* tiny window where we will loose hotplug notifactions.
*/
- intel_fbdev_initial_config(dev);
+ async_schedule(intel_fbdev_initial_config, dev_priv);
drm_kms_helper_poll_init(dev);