From patchwork Fri Dec 5 08:35:03 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 41962 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f199.google.com (mail-wi0-f199.google.com [209.85.212.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 8C4A926669 for ; Fri, 5 Dec 2014 08:36:08 +0000 (UTC) Received: by mail-wi0-f199.google.com with SMTP id bs8sf238008wib.6 for ; Fri, 05 Dec 2014 00:36:07 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:delivered-to:from:to:subject:date :message-id:in-reply-to:references:cc:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :mime-version:content-type:content-transfer-encoding:errors-to :sender:x-original-sender:x-original-authentication-results :mailing-list; bh=CwxHYCDE3IPyLpHaedmJZaVEkiBRUlLAa6rqWrG7X7M=; b=YNH4GN5u9kbcZlj4/EhOgQbHob6+9mhQhm0TMNoJxg92pxU6Ii4Ba61ACbWKhIRDmW T5p2QZSJU3rawRlz8Su+Aio2SbVCUBQOYqXNU1Bi3+UvJB2qJsfhprEcFis9anf56Aw5 bWcpo+6QBYjpbUIeuPHGzEJv/7mvItTN/FCiyYSOZAoHHb/VCYJNycixJg4xidx2J7PV zMzu3DvDqOLHkZspwJd1AlUr64fDNxUIHRqSQ7m4PLdXiWldq/7zAp5qpJAFaenLMKIR PKeycVZFY2EGIaLXzgddA7P8t1LjoXtItsGN91pejqu3RsERuEXaL5UUdvUSGtPX3QRo doVg== X-Gm-Message-State: ALoCoQm2A0JTvLGXwhQxGd4dxY7bF5EiRT3RxwpNBdEksvY5xxt3wNuYKSoudr6gks26yuf1rkMs X-Received: by 10.180.106.67 with SMTP id gs3mr378914wib.3.1417768567861; Fri, 05 Dec 2014 00:36:07 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.30.42 with SMTP id p10ls281926lah.98.gmail; Fri, 05 Dec 2014 00:36:07 -0800 (PST) X-Received: by 10.152.27.74 with SMTP id r10mr1610345lag.87.1417768567608; Fri, 05 Dec 2014 00:36:07 -0800 (PST) Received: from mail-lb0-f174.google.com (mail-lb0-f174.google.com. [209.85.217.174]) by mx.google.com with ESMTPS id v1si26646016lae.56.2014.12.05.00.36.07 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 05 Dec 2014 00:36:07 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.174 as permitted sender) client-ip=209.85.217.174; Received: by mail-lb0-f174.google.com with SMTP id w7so167877lbi.33 for ; Fri, 05 Dec 2014 00:36:07 -0800 (PST) X-Received: by 10.112.189.10 with SMTP id ge10mr1665505lbc.23.1417768567526; Fri, 05 Dec 2014 00:36:07 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.184.201 with SMTP id ew9csp173501lbc; Fri, 5 Dec 2014 00:36:06 -0800 (PST) X-Received: by 10.67.12.236 with SMTP id et12mr26536724pad.31.1417768564626; Fri, 05 Dec 2014 00:36:04 -0800 (PST) Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTP id hf2si19166764pac.204.2014.12.05.00.36.03 for ; Fri, 05 Dec 2014 00:36:04 -0800 (PST) Received-SPF: none (google.com: dri-devel-bounces@lists.freedesktop.org does not designate permitted sender hosts) client-ip=131.252.210.177; Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 453F36E3FD; Fri, 5 Dec 2014 00:36:01 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wg0-f49.google.com (mail-wg0-f49.google.com [74.125.82.49]) by gabe.freedesktop.org (Postfix) with ESMTP id 752196E3E8 for ; Fri, 5 Dec 2014 00:36:00 -0800 (PST) Received: by mail-wg0-f49.google.com with SMTP id n12so280164wgh.8 for ; Fri, 05 Dec 2014 00:35:59 -0800 (PST) X-Received: by 10.195.12.76 with SMTP id eo12mr22398285wjd.22.1417768559846; Fri, 05 Dec 2014 00:35:59 -0800 (PST) Received: from lmenx321.lme.st.com (LPuteaux-656-1-48-212.w82-127.abo.wanadoo.fr. [82.127.83.212]) by mx.google.com with ESMTPSA id eu8sm1299618wib.21.2014.12.05.00.35.58 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 05 Dec 2014 00:35:59 -0800 (PST) From: Benjamin Gaignard To: dri-devel@lists.freedesktop.org, linaro-mm-sig@lists.linaro.org Subject: [PATCH 5/9] drm: sti: remove event lock while disabling vblank Date: Fri, 5 Dec 2014 09:35:03 +0100 Message-Id: <1417768507-7538-6-git-send-email-benjamin.gaignard@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1417768507-7538-1-git-send-email-benjamin.gaignard@linaro.org> References: <1417768507-7538-1-git-send-email-benjamin.gaignard@linaro.org> Cc: Benjamin Gaignard X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: 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-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: benjamin.gaignard@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.174 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 Stop use event_lock in vblank disable function. This was creating a dead lock. Signed-off-by: Benjamin Gaignard --- drivers/gpu/drm/sti/sti_drm_crtc.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/gpu/drm/sti/sti_drm_crtc.c b/drivers/gpu/drm/sti/sti_drm_crtc.c index e1e5550..f527997 100644 --- a/drivers/gpu/drm/sti/sti_drm_crtc.c +++ b/drivers/gpu/drm/sti/sti_drm_crtc.c @@ -365,7 +365,6 @@ void sti_drm_crtc_disable_vblank(struct drm_device *dev, int crtc) struct sti_drm_private *priv = dev->dev_private; struct sti_compositor *compo = priv->compo; struct notifier_block *vtg_vblank_nb = &compo->vtg_vblank_nb; - unsigned long flags; DRM_DEBUG_DRIVER("\n"); @@ -374,13 +373,10 @@ void sti_drm_crtc_disable_vblank(struct drm_device *dev, int crtc) DRM_DEBUG_DRIVER("Warning: cannot unregister VTG notifier\n"); /* free the resources of the pending requests */ - spin_lock_irqsave(&dev->event_lock, flags); if (compo->mixer[crtc]->pending_event) { drm_vblank_put(dev, crtc); compo->mixer[crtc]->pending_event = NULL; } - spin_unlock_irqrestore(&dev->event_lock, flags); - } EXPORT_SYMBOL(sti_drm_crtc_disable_vblank);