From bf5bbbf801db60569d6d66e8dfac0de1324789b9 Mon Sep 17 00:00:00 2001
From: Rob Clark <rob@ti.com>
Date: Mon, 5 Mar 2012 10:48:32 -0600
Subject: [PATCH] --- yaml --- r: 289196 b: refs/heads/master c:
 5609f7fe306508d77e0dcf1de2c9a957b6af1e06 h: refs/heads/master v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/staging/omapdrm/omap_drv.c | 8 ++++++++
 trunk/drivers/staging/omapdrm/omap_drv.h | 2 ++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 40ce5a34187a..8c9d06d3b065 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a890e6623ae024d28f855d672e72649fa2cb511e
+refs/heads/master: 5609f7fe306508d77e0dcf1de2c9a957b6af1e06
diff --git a/trunk/drivers/staging/omapdrm/omap_drv.c b/trunk/drivers/staging/omapdrm/omap_drv.c
index 3bbea9aac404..7417e1f35aa9 100644
--- a/trunk/drivers/staging/omapdrm/omap_drv.c
+++ b/trunk/drivers/staging/omapdrm/omap_drv.c
@@ -570,6 +570,9 @@ static int dev_load(struct drm_device *dev, unsigned long flags)
 
 	dev->dev_private = priv;
 
+	priv->wq = alloc_workqueue("omapdrm",
+			WQ_UNBOUND | WQ_NON_REENTRANT, 1);
+
 	omap_gem_init(dev);
 
 	ret = omap_modeset_init(dev);
@@ -598,6 +601,8 @@ static int dev_load(struct drm_device *dev, unsigned long flags)
 
 static int dev_unload(struct drm_device *dev)
 {
+	struct omap_drm_private *priv = dev->dev_private;
+
 	DBG("unload: dev=%p", dev);
 
 	drm_vblank_cleanup(dev);
@@ -607,6 +612,9 @@ static int dev_unload(struct drm_device *dev)
 	omap_modeset_free(dev);
 	omap_gem_deinit(dev);
 
+	flush_workqueue(priv->wq);
+	destroy_workqueue(priv->wq);
+
 	kfree(dev->dev_private);
 	dev->dev_private = NULL;
 
diff --git a/trunk/drivers/staging/omapdrm/omap_drv.h b/trunk/drivers/staging/omapdrm/omap_drv.h
index d924c95c769e..a84547c2464b 100644
--- a/trunk/drivers/staging/omapdrm/omap_drv.h
+++ b/trunk/drivers/staging/omapdrm/omap_drv.h
@@ -51,6 +51,8 @@ struct omap_drm_private {
 
 	struct drm_fb_helper *fbdev;
 
+	struct workqueue_struct *wq;
+
 	bool has_dmm;
 };