Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e00bf696 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Move the fbdev async_schedule() into intel_fbdev.c 



Reading the driver load/unload code leaves one confused as there's
an async_schedule() in the load, but not async_synchronize_full()
in sight. In fact it's hidden inside intel_fbdev.c. So let's move the
async_schedule() into intel_fbdev.c as well so that it's next to the
async_synchronize_full(), which should make the relationship easier
to see.

Plus this way we won't schedule a nop function call when fbdev is
disabled. And we were passing a pointer to a static inline
function to async_schedule(), which seems rather dubious to me.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1446815313-9490-4-git-send-email-ville.syrjala@linux.intel.com


Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent 2013bfc0

drivers/gpu/drm/i915/i915_dma.c

+1 −2
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 


#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>
@@ -469,7 +468,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.

	 */

	async_schedule(intel_fbdev_initial_config, dev_priv);

	intel_fbdev_initial_config_async(dev);



	drm_kms_helper_poll_init(dev);

drivers/gpu/drm/i915/intel_drv.h

+2 −2
Original line number Diff line number Diff line
@@ -1297,7 +1297,7 @@ void intel_dvo_init(struct drm_device *dev); 
/* legacy fbdev emulation in intel_fbdev.c */

#ifdef CONFIG_DRM_FBDEV_EMULATION

extern int intel_fbdev_init(struct drm_device *dev);

extern void intel_fbdev_initial_config(void *data, async_cookie_t cookie);

extern void intel_fbdev_initial_config_async(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_output_poll_changed(struct drm_device *dev);
@@ -1308,7 +1308,7 @@ static inline int intel_fbdev_init(struct drm_device *dev) 
	return 0;

}



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

static inline void intel_fbdev_initial_config_async(struct drm_device *dev)

{

}

drivers/gpu/drm/i915/intel_fbdev.c

+6 −1
Original line number Diff line number Diff line
@@ -705,7 +705,7 @@ int intel_fbdev_init(struct drm_device *dev) 
	return 0;

}



void intel_fbdev_initial_config(void *data, async_cookie_t cookie)

static void intel_fbdev_initial_config(void *data, async_cookie_t cookie)

{

	struct drm_i915_private *dev_priv = data;

	struct intel_fbdev *ifbdev = dev_priv->fbdev;
@@ -714,6 +714,11 @@ void intel_fbdev_initial_config(void *data, async_cookie_t cookie) 
	drm_fb_helper_initial_config(&ifbdev->helper, ifbdev->preferred_bpp);

}



void intel_fbdev_initial_config_async(struct drm_device *dev)

{

	async_schedule(intel_fbdev_initial_config, to_i915(dev));

}



void intel_fbdev_fini(struct drm_device *dev)

{

	struct drm_i915_private *dev_priv = dev->dev_private;