From patchwork Fri Apr 8 11:11:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 8782861 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id ED4E2C0553 for ; Fri, 8 Apr 2016 11:11:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1419D20222 for ; Fri, 8 Apr 2016 11:11:29 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 13B7D2017E for ; Fri, 8 Apr 2016 11:11:28 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A9FAF6EA7B; Fri, 8 Apr 2016 11:11:27 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 361146EA7B for ; Fri, 8 Apr 2016 11:11:26 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id y144so3509003wmd.0 for ; Fri, 08 Apr 2016 04:11:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=tWGNilsmiPCr3GiDcWHWF2tBEvc3EZvMY9xnTrAbd+w=; b=IMYZexidQivj/dnXHrdYPKrcpybX0FSjXs5NZj9dchDPtZBbAwTXcJPnW9WYMeDtRV sTIyXvJEary9Aa/6KjsxygAP28WKrncFUlT1qS2ZmczdhlPoX1i2Lr/pma3tjzjcRWv5 gQxRnp5LSsAlbtlX217TkhXiEdibKRMSLZclnkXeu2DgjZWW2ZnwK0yhF/iPc2qneB8v 7QFB/snbrs4P0Xbj8ZiP5uEvk0g2IZxFOtl7SiNikWgudr5vIDMfy8YQ3/1xOaH8oSel 5GWX4iFh+AtsWwITiTxGv1Sk9cfXnoh3bnZn5Ap0c1osWAeM/swjA42WW2GsjGzrDy8A HGJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=tWGNilsmiPCr3GiDcWHWF2tBEvc3EZvMY9xnTrAbd+w=; b=kYhT8snKsrEKFW9UAUXSci9hWBIYhUZLP4O/hVZmKHeNsf4v2HRaLtlsMVwuOgrH7y 9FSAEkGLEd1kWyGwhMJE9qYBp9CVa/7UuMitZ0sPP7m/oX48L5+egUHj7EqB6/MkAHkD nl1XYmPJYxwTOHw8rYevpcHWDm1uY+X2Bkd6HIK+aG9SeIm4e9uzXEaKBKlH3gB4KNhX bsYKdO1VZhSGs1C7XKOSeOk97XGABAnV9PDfIvy+Ze8jxEpJv7HR4JZDfuiXdTW8Ratw tO2iuo2exeVZI7FvVT0euB9W0VQmlT9btGvsX8pIM9Jd63H1dIwNNwhCYd5AHZoTOU8P 9qYw== X-Gm-Message-State: AD7BkJJ9SVF6W460HBGZ+ShA2c/x8q1MKNjN07taQ/tYrnwtkuKJKw7hw+Tc0l420SxEEg== X-Received: by 10.28.49.3 with SMTP id x3mr3028698wmx.4.1460113884924; Fri, 08 Apr 2016 04:11:24 -0700 (PDT) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id d131sm2547308wmd.12.2016.04.08.04.11.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 08 Apr 2016 04:11:23 -0700 (PDT) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Fri, 8 Apr 2016 12:11:09 +0100 Message-Id: <1460113874-17366-2-git-send-email-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.8.0.rc3 In-Reply-To: <1460113874-17366-1-git-send-email-chris@chris-wilson.co.uk> References: <1460113874-17366-1-git-send-email-chris@chris-wilson.co.uk> Subject: [Intel-gfx] [PATCH v2 1/6] drm/i915/dmabuf: Tighten struct_mutex for unmap_dma_buf X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-5.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP We only need the struct_mutex to manipulate the pages_pin_count on the object, we do not need to hold our BKL when freeing the exported scatterlist. Signed-off-by: Chris Wilson Reviewed-by: Tvrtko Ursulin Cc: Tvrtko Ursulin --- drivers/gpu/drm/i915/i915_gem_dmabuf.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_gem_dmabuf.c b/drivers/gpu/drm/i915/i915_gem_dmabuf.c index 0506016e18e0..b7d46800c49f 100644 --- a/drivers/gpu/drm/i915/i915_gem_dmabuf.c +++ b/drivers/gpu/drm/i915/i915_gem_dmabuf.c @@ -95,14 +95,12 @@ static void i915_gem_unmap_dma_buf(struct dma_buf_attachment *attachment, { struct drm_i915_gem_object *obj = dma_buf_to_obj(attachment->dmabuf); - mutex_lock(&obj->base.dev->struct_mutex); - dma_unmap_sg(attachment->dev, sg->sgl, sg->nents, dir); sg_free_table(sg); kfree(sg); + mutex_lock(&obj->base.dev->struct_mutex); i915_gem_object_unpin_pages(obj); - mutex_unlock(&obj->base.dev->struct_mutex); }