From patchwork Wed Aug 22 23:40:57 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tejun Heo X-Patchwork-Id: 1363731 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork1.kernel.org (Postfix) with ESMTP id C11463FC71 for ; Wed, 22 Aug 2012 23:41:11 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id AE3449EB5E for ; Wed, 22 Aug 2012 16:41:11 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pb0-f49.google.com (mail-pb0-f49.google.com [209.85.160.49]) by gabe.freedesktop.org (Postfix) with ESMTP id 32DF89E978; Wed, 22 Aug 2012 16:41:02 -0700 (PDT) Received: by pbbrq8 with SMTP id rq8so224035pbb.36 for ; Wed, 22 Aug 2012 16:41:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:date:from:to:cc:subject:message-id:mime-version:content-type :content-disposition:user-agent; bh=NMw4Wj4ecoQifKCvBa/MhaZbUMuzuMAHKk9HEQW5Y28=; b=vV5tDf4mkuDxM0cvCO7UybOfWlPEOoDVvkoliT0FTB/yxAZCtYtfyFp468ye1kdywF AigIfFbYi4nbdZnly3G6rjN1QKLvNvPO0e7/MiWTHrYcu7UyW4Fv0maZ7qKD3Xb92YpY VBAXAw6K5V/IPN63H1TsEYwEf6D3DDwxxcXRjyxIEFDFW+MkLSXNvWIJF4VZCBVtUc9p IU2wteLYOmqfVLOxusX6mdEPMMXkQs/Rsz9L6f78j4HycqsNCpYQCp1rDf+IdNsj8Lgm t2lmQ5aOMAWhlyl+nizP8gbKyPuBB3lu1MMyeB6s9Uu62CQLeBwCsq1PMiqq4Sp2leaa x5nA== Received: by 10.66.85.71 with SMTP id f7mr49710423paz.5.1345678861972; Wed, 22 Aug 2012 16:41:01 -0700 (PDT) Received: from google.com (wtj.mtv.corp.google.com [172.18.110.84]) by mx.google.com with ESMTPS id qb2sm3369027pbb.15.2012.08.22.16.41.00 (version=SSLv3 cipher=OTHER); Wed, 22 Aug 2012 16:41:00 -0700 (PDT) Date: Wed, 22 Aug 2012 16:40:57 -0700 From: Tejun Heo To: Daniel Vetter Subject: [PATCH] i915: use alloc_ordered_workqueue() instead of explicit UNBOUND w/ max_active = 1 Message-ID: <20120822234057.GR19212@google.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) Cc: intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org This is an equivalent conversion and will ease scheduled removal of WQ_NON_REENTRANT. Signed-off-by: Tejun Heo Reviewed-by: Chris Wilson Acked-by: Daniel Vetter for merging through any --- drivers/gpu/drm/i915/i915_dma.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index 9cf7dfe..a55ca7a 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c @@ -1536,11 +1536,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;