Commit d1d70677 authored by Jesse Barnes's avatar Jesse Barnes Committed by Daniel Vetter
Browse files

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: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
[danvet: Rebase on top of the dev_priv->enable_hotplug_processing
removal.]
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 00e1e623

drivers/gpu/drm/i915/i915_dma.c

+2 −1
Original line number Diff line number Diff line
@@ -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);

drivers/gpu/drm/i915/intel_drv.h

+3 −2
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#ifndef __INTEL_DRV_H__

#define __INTEL_DRV_H__



#include <linux/async.h>

#include <linux/i2c.h>

#include <linux/hdmi.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 */

#ifdef CONFIG_DRM_I915_FBDEV

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_set_suspend(struct drm_device *dev, int state, bool synchronous);

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;

}



static inline void intel_fbdev_initial_config(struct drm_device *dev)

static inline void intel_fbdev_initial_config(void *data, async_cookie_t cookie)

{

}

drivers/gpu/drm/i915/intel_fbdev.c

+4 −2
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
 *     David Airlie

 */



#include <linux/async.h>

#include <linux/module.h>

#include <linux/kernel.h>

#include <linux/console.h>
@@ -670,9 +671,9 @@ int intel_fbdev_init(struct drm_device *dev) 
	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. */
@@ -687,6 +688,7 @@ void intel_fbdev_fini(struct drm_device *dev) 


	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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE