From patchwork Wed May 14 18:51:03 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 4176841 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 9057FBFF02 for ; Wed, 14 May 2014 18:51:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C204720220 for ; Wed, 14 May 2014 18:51:33 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 97373202FF for ; Wed, 14 May 2014 18:51:32 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2DEC66ECC7; Wed, 14 May 2014 11:51:31 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-ee0-f46.google.com (mail-ee0-f46.google.com [74.125.83.46]) by gabe.freedesktop.org (Postfix) with ESMTP id 80AA76ECC5 for ; Wed, 14 May 2014 11:51:29 -0700 (PDT) Received: by mail-ee0-f46.google.com with SMTP id t10so3142eei.33 for ; Wed, 14 May 2014 11:51:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Bwy3ZIR56IZ/8CF6RJEXbERCH1zYBtcmyAwH+OtzT7o=; b=B/5u4suqSdfqToBbyUF7J30jdymCnZ4iMwfQ8QaZiDvfM3HquKS9uCet2WfctSkmn3 S9o8lvKBKaNDdGS3vMLwj2SfDVCet7H2vhmip7V3wZjqXoseQiC4XrRduG/WjGusgVSr mU0WReUZGPZU7jK9zXKOt82+hNYfRD/0QFSQU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Bwy3ZIR56IZ/8CF6RJEXbERCH1zYBtcmyAwH+OtzT7o=; b=l4lBlV5hYX6yLkzEmJPKLdMbImuLCr/gABgsfMOqb8RjJIppy6zW3o5Trb0tD8gGCW fRGjJqzPyUA7LaDnFsYNkNS8s1v03fsnpS5m+eOE2zQ0voITq/ZOYq6HGvDJG/eUTPMO Rm7NsQYfelq6ujal+QbQ6IEUntJYj9+ROHH3LFu7sBCsQzgWlmiVacyobTeXHgU4TFTj v1zm/ia7E9hbL07jZWyBJzYucxnZ0xI+AhNrV9RpvwPk5t8Jv8y5BSCAg1pi0UeAq7mZ Ztv4WKCg2BbTOfeJbVzLSgCyzNsQNSkuI1Kcg9VaiEjmduLsiViayzZHyC8eC3XJIn/Y rWww== X-Gm-Message-State: ALoCoQmgx3DgeMQFERQgoVcGO3BkPlzwaMLUvANOi5pkZN+ibVePoGP1mGtKeheGBen8Y9kOcXGh X-Received: by 10.14.99.68 with SMTP id w44mr6068331eef.82.1400093488652; Wed, 14 May 2014 11:51:28 -0700 (PDT) Received: from bremse.ffwll.local (84-73-67-144.dclient.hispeed.ch. [84.73.67.144]) by mx.google.com with ESMTPSA id a4sm6973179eep.12.2014.05.14.11.51.26 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 May 2014 11:51:27 -0700 (PDT) From: Daniel Vetter To: DRI Development , Intel Graphics Development Subject: [PATCH 01/12] drm: Use correct spinlock flavor in drm_vblank_get() Date: Wed, 14 May 2014 20:51:03 +0200 Message-Id: <1400093477-3217-2-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1400093477-3217-1-git-send-email-daniel.vetter@ffwll.ch> References: <1400093477-3217-1-git-send-email-daniel.vetter@ffwll.ch> Cc: Daniel Vetter , Peter Hurley X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable 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 From: Peter Hurley The irq flags state is already established by the outer spin_lock_irqsave(); re-disabling irqs is redundant. Signed-off-by: Peter Hurley Signed-off-by: Daniel Vetter Reviewed-by: Thierry Reding --- drivers/gpu/drm/drm_irq.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c index 7583767ec619..ea20c4aa1b6b 100644 --- a/drivers/gpu/drm/drm_irq.c +++ b/drivers/gpu/drm/drm_irq.c @@ -848,13 +848,13 @@ static void drm_update_vblank_count(struct drm_device *dev, int crtc) */ int drm_vblank_get(struct drm_device *dev, int crtc) { - unsigned long irqflags, irqflags2; + unsigned long irqflags; int ret = 0; spin_lock_irqsave(&dev->vbl_lock, irqflags); /* Going from 0->1 means we have to enable interrupts again */ if (atomic_add_return(1, &dev->vblank[crtc].refcount) == 1) { - spin_lock_irqsave(&dev->vblank_time_lock, irqflags2); + spin_lock(&dev->vblank_time_lock); if (!dev->vblank[crtc].enabled) { /* Enable vblank irqs under vblank_time_lock protection. * All vblank count & timestamp updates are held off @@ -872,7 +872,7 @@ int drm_vblank_get(struct drm_device *dev, int crtc) drm_update_vblank_count(dev, crtc); } } - spin_unlock_irqrestore(&dev->vblank_time_lock, irqflags2); + spin_unlock(&dev->vblank_time_lock); } else { if (!dev->vblank[crtc].enabled) { atomic_dec(&dev->vblank[crtc].refcount);