From patchwork Tue Mar 21 10:55:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tvrtko Ursulin X-Patchwork-Id: 9636383 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 46E26602D6 for ; Tue, 21 Mar 2017 10:55:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 39F7E2793A for ; Tue, 21 Mar 2017 10:55:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2E98227F10; Tue, 21 Mar 2017 10:55:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id ABF1F2793A for ; Tue, 21 Mar 2017 10:55:22 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5EB6E6E333; Tue, 21 Mar 2017 10:55:22 +0000 (UTC) X-Original-To: Intel-gfx@lists.freedesktop.org Delivered-To: Intel-gfx@lists.freedesktop.org Received: from mail-wr0-x244.google.com (mail-wr0-x244.google.com [IPv6:2a00:1450:400c:c0c::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id D6B786E333 for ; Tue, 21 Mar 2017 10:55:20 +0000 (UTC) Received: by mail-wr0-x244.google.com with SMTP id u108so21929548wrb.2 for ; Tue, 21 Mar 2017 03:55:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ursulin-net.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=hG4MSOQ6zFf7rDkHcoe6dmhVQrnmpwHif56aRBEp9q0=; b=BN0HTuKypXIhMHjGrwydmsDb0iIqf6WdjTYg9RX9NJ8ngSa/2fKsgO1pzjt/1YNOSU gaFdEYveaLFO9KseDzUfKjkeNM7bbGFJdcQ9pTeWS3xc4/n822FNeDB8lSYtbSDEn+VS 3EjokJCiUfs5teOwTR9Evjkl/ue7Ph//qUm5Xq07Q2K5OCz+GuIo3OtSGw2HWo2QYcxG GWQr3x8EA69zfXysOX06FoPkHaxucxiTHXA6Mm8WZnKwWsMoyob9cexUD4MOq+aa4peG kv5XsCJfaE+MVEDoX7DVi3R3xmLS0OBZz0chHTngiZktlQSihbklvkEiS9mIhk1wsVbl pNkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=hG4MSOQ6zFf7rDkHcoe6dmhVQrnmpwHif56aRBEp9q0=; b=D29522sDoEhYbwP1e814QBoiOkW4dNVGxfFRfjXY2zGuI/nZSOjzDExxLTuEG5rzwu +sAif3qfgxgX/oBzsEppSP9xkYLBMMbKNkWYvNEbfy8CW4gvzIO/hiqTcwhKQJsW2jvd 2w776SOx6z9ugkR3PsXGwg/m/CUOM6qBvaX21mXSZ5PbNlJoOnkNYqsPwi5cYMl6L0H4 GAoSX6ziR+RvFN1apF3QJ/4xto9PXwhcejDWO9mWjB4cE8GzNzQnrwwOu6v04EfCiUNy GPhLgxDJR8DB+dRfQZaKFDtl2RE9gOSbOGMAaygNgLFrhzTkOOknAkAVUfzWn/FKvxcY HiBw== X-Gm-Message-State: AFeK/H18WlJrc612ls/bpcI7q1gJxMiYOzG7c2V/vIQTVjHuYYJ5gWOgmic53nikNouhVQ== X-Received: by 10.223.134.98 with SMTP id 31mr33130089wrw.69.1490093719602; Tue, 21 Mar 2017 03:55:19 -0700 (PDT) Received: from t460p.intel ([2.123.51.169]) by smtp.gmail.com with ESMTPSA id u145sm17157701wmu.1.2017.03.21.03.55.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Mar 2017 03:55:19 -0700 (PDT) From: Tvrtko Ursulin X-Google-Original-From: Tvrtko Ursulin To: Intel-gfx@lists.freedesktop.org Date: Tue, 21 Mar 2017 10:55:11 +0000 Message-Id: <20170321105511.18269-1-tvrtko.ursulin@linux.intel.com> X-Mailer: git-send-email 2.9.3 Subject: [Intel-gfx] [PATCH] drm/i915: Spinlocks in tasklets can use spin_(un)lock_irq 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-Virus-Scanned: ClamAV using ClamSMTP From: Tvrtko Ursulin The tasklets callbacks are only called from tasklet context so it is safe do to this. Signed-off-by: Tvrtko Ursulin Cc: Chris Wilson Reviewed-by: Chris Wilson --- drivers/gpu/drm/i915/i915_guc_submission.c | 5 ++--- drivers/gpu/drm/i915/intel_lrc.c | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_guc_submission.c b/drivers/gpu/drm/i915/i915_guc_submission.c index 1a9611546cca..cb768d01a06a 100644 --- a/drivers/gpu/drm/i915/i915_guc_submission.c +++ b/drivers/gpu/drm/i915/i915_guc_submission.c @@ -573,7 +573,6 @@ static bool i915_guc_dequeue(struct intel_engine_cs *engine) { struct execlist_port *port = engine->execlist_port; struct drm_i915_gem_request *last = port[0].request; - unsigned long flags; struct rb_node *rb; bool submit = false; @@ -589,7 +588,7 @@ static bool i915_guc_dequeue(struct intel_engine_cs *engine) if (!READ_ONCE(engine->execlist_first)) return false; - spin_lock_irqsave(&engine->timeline->lock, flags); + spin_lock_irq(&engine->timeline->lock); rb = engine->execlist_first; while (rb) { struct drm_i915_gem_request *rq = @@ -619,7 +618,7 @@ static bool i915_guc_dequeue(struct intel_engine_cs *engine) nested_enable_signaling(last); engine->execlist_first = rb; } - spin_unlock_irqrestore(&engine->timeline->lock, flags); + spin_unlock_irq(&engine->timeline->lock); return submit; } diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c index dab73e7d9a6b..3813b2ff3544 100644 --- a/drivers/gpu/drm/i915/intel_lrc.c +++ b/drivers/gpu/drm/i915/intel_lrc.c @@ -399,7 +399,6 @@ static void execlists_dequeue(struct intel_engine_cs *engine) { struct drm_i915_gem_request *last; struct execlist_port *port = engine->execlist_port; - unsigned long flags; struct rb_node *rb; bool submit = false; @@ -448,7 +447,7 @@ static void execlists_dequeue(struct intel_engine_cs *engine) * and context switches) submission. */ - spin_lock_irqsave(&engine->timeline->lock, flags); + spin_lock_irq(&engine->timeline->lock); rb = engine->execlist_first; while (rb) { struct drm_i915_gem_request *cursor = @@ -500,7 +499,7 @@ static void execlists_dequeue(struct intel_engine_cs *engine) i915_gem_request_assign(&port->request, last); engine->execlist_first = rb; } - spin_unlock_irqrestore(&engine->timeline->lock, flags); + spin_unlock_irq(&engine->timeline->lock); if (submit) execlists_submit_ports(engine);