leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/i915: make fbdev initialization asynchronous v2

Browse Source 
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>
This commit is contained in:
Jesse Barnes 2014-05-28 14:39:03 -07:00 committed by Daniel Vetter
parent 00e1e623e6
commit d1d70677e1
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/gpu/drm/i915/i915_dma.c
View File

@ -28,6 +28,7 @@
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/async.h>
#include <drm/drmP.h> #include <drm/drmP.h>
#include <drm/drm_crtc_helper.h> #include <drm/drm_crtc_helper.h>
#include <drm/drm_fb_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 * scanning against hotplug events. Hence do this first and ignore the
* tiny window where we will loose hotplug notifactions. * 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); drm_kms_helper_poll_init(dev);

5
drivers/gpu/drm/i915/intel_drv.h
View File

@ -25,6 +25,7 @@
#ifndef __INTEL_DRV_H__ #ifndef __INTEL_DRV_H__
#define __INTEL_DRV_H__ #define __INTEL_DRV_H__
#include <linux/async.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/hdmi.h> #include <linux/hdmi.h>
#include <drm/i915_drm.h> #include <drm/i915_drm.h>
@ -953,7 +954,7 @@ void intel_dvo_init(struct drm_device *dev);
/* legacy fbdev emulation in intel_fbdev.c */ /* legacy fbdev emulation in intel_fbdev.c */
#ifdef CONFIG_DRM_I915_FBDEV #ifdef CONFIG_DRM_I915_FBDEV
extern int intel_fbdev_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_initial_config(void *data, async_cookie_t cookie);
extern void intel_fbdev_fini(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, bool synchronous); 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_output_poll_changed(struct drm_device *dev);
@ -964,7 +965,7 @@ static inline int intel_fbdev_init(struct drm_device *dev)
return 0; return 0;
} }
static inline void intel_fbdev_initial_config(struct drm_device *dev) static inline void intel_fbdev_initial_config(void *data, async_cookie_t cookie)
{ {
} }

6
drivers/gpu/drm/i915/intel_fbdev.c
View File

@ -24,6 +24,7 @@
* David Airlie * David Airlie
*/ */
#include <linux/async.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/console.h> #include <linux/console.h>
@ -670,9 +671,9 @@ int intel_fbdev_init(struct drm_device *dev)
return 0; 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; struct intel_fbdev *ifbdev = dev_priv->fbdev;
/* Due to peculiar init order wrt to hpd handling this is separate. */ /* Due to peculiar init order wrt to hpd handling this is separate. */
@ -687,6 +688,7 @@ void intel_fbdev_fini(struct drm_device *dev)
flush_work(&dev_priv->fbdev_suspend_work); flush_work(&dev_priv->fbdev_suspend_work);
async_synchronize_full();
intel_fbdev_destroy(dev, dev_priv->fbdev); intel_fbdev_destroy(dev, dev_priv->fbdev);
kfree(dev_priv->fbdev); kfree(dev_priv->fbdev);
dev_priv->fbdev = NULL; dev_priv->fbdev = NULL;