summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_dma.c
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2012-08-22 16:40:57 -0700
committerDaniel Vetter <daniel.vetter@ffwll.ch>2012-08-24 01:13:53 +0200
commit53621860c38caff37fff99ba5f0b817511907bc4 (patch)
tree781a9b2ade75ec50ba15559e506c43507786533b /drivers/gpu/drm/i915/i915_dma.c
parentb4c145c1d245c2cc19754dbe4b718f5a48755993 (diff)
downloadlinux-53621860c38caff37fff99ba5f0b817511907bc4.tar.gz
linux-53621860c38caff37fff99ba5f0b817511907bc4.tar.bz2
linux-53621860c38caff37fff99ba5f0b817511907bc4.zip
i915: use alloc_ordered_workqueue() instead of explicit UNBOUND w/ max_active = 1
This is an equivalent conversion and will ease scheduled removal of WQ_NON_REENTRANT. Signed-off-by: Tejun Heo <tj@kernel.org> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_dma.c')
-rw-r--r--drivers/gpu/drm/i915/i915_dma.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index 2cba7b4a04ed..2c09900e3267 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -1558,11 +1558,9 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
*
* All tasks on the workqueue are expected to acquire the dev mutex
* so there is no point in running more than one instance of the
- * workqueue at any time: max_active = 1 and NON_REENTRANT.
+ * workqueue at any time. Use an ordered one.
*/
- dev_priv->wq = alloc_workqueue("i915",
- WQ_UNBOUND | WQ_NON_REENTRANT,
- 1);
+ dev_priv->wq = alloc_ordered_workqueue("i915", 0);
if (dev_priv->wq == NULL) {
DRM_ERROR("Failed to create our workqueue.\n");
ret = -ENOMEM;