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

Commit 43cee314 authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915/fbdev: Limit the global async-domain synchronization 



During cleanup we have to synchronise with the async task we are using
to initialise and register our fbdev. Currently, we are using a full
synchronisation on the global domain, but we can restrict this to just
synchronising up to our task if we remember our cookie.

Whilst there, streamline the function parameters.

v2: async_synchronize_cookie() takes an exclusive upper bound, to
synchronize with our task we have to pass in the next cookie.
v3: Drop premature disregarding of the active cookie (we need to wait
until the task is complete before continuing in the teardown).
v4: Refactor waiting on async to incorporate a comment explaining why we
need the +1.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Lukas Wunner <lukas@wunner.de>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1466497015-8509-2-git-send-email-chris@chris-wilson.co.uk
parent d626f345

drivers/gpu/drm/i915/intel_drv.h

+1 −0
Original line number Diff line number Diff line
@@ -159,6 +159,7 @@ struct intel_framebuffer { 
struct intel_fbdev {

	struct drm_fb_helper helper;

	struct intel_framebuffer *fb;

	async_cookie_t cookie;

	int preferred_bpp;

};

drivers/gpu/drm/i915/intel_fbdev.c

+26 −13
Original line number Diff line number Diff line
@@ -538,8 +538,7 @@ static const struct drm_fb_helper_funcs intel_fb_helper_funcs = { 
	.fb_probe = intelfb_create,

};



static void intel_fbdev_destroy(struct drm_device *dev,

				struct intel_fbdev *ifbdev)

static void intel_fbdev_destroy(struct intel_fbdev *ifbdev)

{

	/* We rely on the object-free to release the VMA pinning for

	 * the info->screen_base mmaping. Leaking the VMA is simpler than
@@ -552,12 +551,14 @@ static void intel_fbdev_destroy(struct drm_device *dev, 
	drm_fb_helper_fini(&ifbdev->helper);



	if (ifbdev->fb) {

		mutex_lock(&dev->struct_mutex);

		mutex_lock(&ifbdev->helper.dev->struct_mutex);

		intel_unpin_fb_obj(&ifbdev->fb->base, BIT(DRM_ROTATE_0));

		mutex_unlock(&dev->struct_mutex);

		mutex_unlock(&ifbdev->helper.dev->struct_mutex);



		drm_framebuffer_remove(&ifbdev->fb->base);

	}



	kfree(ifbdev);

}



/*
@@ -732,32 +733,44 @@ int intel_fbdev_init(struct drm_device *dev) 


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;

	struct intel_fbdev *ifbdev = data;



	/* Due to peculiar init order wrt to hpd handling this is separate. */

	if (drm_fb_helper_initial_config(&ifbdev->helper,

					 ifbdev->preferred_bpp))

		intel_fbdev_fini(dev_priv->dev);

		intel_fbdev_fini(ifbdev->helper.dev);

}



void intel_fbdev_initial_config_async(struct drm_device *dev)

{

	async_schedule(intel_fbdev_initial_config, to_i915(dev));

	struct intel_fbdev *ifbdev = to_i915(dev)->fbdev;



	ifbdev->cookie = async_schedule(intel_fbdev_initial_config, ifbdev);

}



static void intel_fbdev_sync(struct intel_fbdev *ifbdev)

{

	if (!ifbdev->cookie)

		return;



	/* Only serialises with all preceding async calls, hence +1 */

	async_synchronize_cookie(ifbdev->cookie + 1);

	ifbdev->cookie = 0;

}



void intel_fbdev_fini(struct drm_device *dev)

{

	struct drm_i915_private *dev_priv = dev->dev_private;

	if (!dev_priv->fbdev)

	struct intel_fbdev *ifbdev = dev_priv->fbdev;



	if (!ifbdev)

		return;



	flush_work(&dev_priv->fbdev_suspend_work);



	if (!current_is_async())

		async_synchronize_full();

	intel_fbdev_destroy(dev, dev_priv->fbdev);

	kfree(dev_priv->fbdev);

		intel_fbdev_sync(ifbdev);



	intel_fbdev_destroy(ifbdev);

	dev_priv->fbdev = NULL;

}