Attachment 124389 Details for Bug 96428 – 0001-Revert-d1d70677e165-drm-i915-make-fbdev-initializati.patch

[patch] 0001-Revert-d1d70677e165-drm-i915-make-fbdev-initializati.patch

0001-Revert-d1d70677e165-drm-i915-make-fbdev-initializati.patch (text/plain), 3.42 KB, created by Chris Bainbridge on 2016-06-07 19:31:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Bainbridge

Created: 2016-06-07 19:31:42 UTC

Size: 3.42 KB

patch

obsolete

>From 96834d0441a15cf8dd9404bea82b8b50105fc403 Mon Sep 17 00:00:00 2001
>From: Chris Bainbridge <chris.bainbridge@gmail.com>
>Date: Fri, 3 Jun 2016 13:51:59 +0100
>Subject: [PATCH] Revert d1d70677e165 ("drm/i915: make fbdev initialization
> asynchronous v2")
>
>Signed-off-by: Chris Bainbridge <chris.bainbridge@gmail.com>
>---
> drivers/gpu/drm/i915/i915_dma.c    |  2 +-
> drivers/gpu/drm/i915/intel_drv.h   |  4 ++--
> drivers/gpu/drm/i915/intel_fbdev.c | 12 ++----------
> 3 files changed, 5 insertions(+), 13 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
>index 1c6d227aae7c..c29ec48cec79 100644
>--- a/drivers/gpu/drm/i915/i915_dma.c
>+++ b/drivers/gpu/drm/i915/i915_dma.c
>@@ -436,7 +436,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_async(dev);
>+	intel_fbdev_initial_config(dev);
> 
> 	drm_kms_helper_poll_init(dev);
> 
>diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
>index 9d0770c23fde..82f43727e124 100644
>--- a/drivers/gpu/drm/i915/intel_drv.h
>+++ b/drivers/gpu/drm/i915/intel_drv.h
>@@ -1298,7 +1298,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_async(struct drm_device *dev);
>+extern void intel_fbdev_initial_config(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);
>@@ -1309,7 +1309,7 @@ static inline int intel_fbdev_init(struct drm_device *dev)
> 	return 0;
> }
> 
>-static inline void intel_fbdev_initial_config_async(struct drm_device *dev)
>+static inline void intel_fbdev_initial_config(struct drm_device *dev)
> {
> }
> 
>diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c
>index 97a91e631915..f30dccf65f20 100644
>--- a/drivers/gpu/drm/i915/intel_fbdev.c
>+++ b/drivers/gpu/drm/i915/intel_fbdev.c
>@@ -24,7 +24,6 @@
>  *     David Airlie
>  */
> 
>-#include <linux/async.h>
> #include <linux/module.h>
> #include <linux/kernel.h>
> #include <linux/console.h>
>@@ -717,9 +716,9 @@ int intel_fbdev_init(struct drm_device *dev)
> 	return 0;
> }
> 
>-static void intel_fbdev_initial_config(void *data, async_cookie_t cookie)
>+void intel_fbdev_initial_config(struct drm_device *dev)
> {
>-	struct drm_i915_private *dev_priv = data;
>+	struct drm_i915_private *dev_priv = dev->dev_private;
> 	struct intel_fbdev *ifbdev = dev_priv->fbdev;
> 
> 	/* Due to peculiar init order wrt to hpd handling this is separate. */
>@@ -728,11 +727,6 @@ static void intel_fbdev_initial_config(void *data, async_cookie_t cookie)
> 		intel_fbdev_fini(dev_priv->dev);
> }
> 
>-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;
>@@ -741,8 +735,6 @@ void intel_fbdev_fini(struct drm_device *dev)
> 
> 	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);
> 	dev_priv->fbdev = NULL;
>-- 
>2.1.4
>

Actions: View | Splinter Review

Attachments on bug 96428: 124389

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.