From patchwork Wed Jan 23 16:25:09 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 2025831 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork2.kernel.org (Postfix) with ESMTP id EDE46DF2E5 for ; Wed, 23 Jan 2013 16:28:52 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CDA8DE6B68 for ; Wed, 23 Jan 2013 08:28:52 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wi0-f173.google.com (mail-wi0-f173.google.com [209.85.212.173]) by gabe.freedesktop.org (Postfix) with ESMTP id 929FAE63A6 for ; Wed, 23 Jan 2013 08:25:23 -0800 (PST) Received: by mail-wi0-f173.google.com with SMTP id hn17so877087wib.12 for ; Wed, 23 Jan 2013 08:25:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=K5TzbTrk8T7PlYc7NzJF75AAXgSC4lo76yDoobNiRvc=; b=QKoIGqs4JiNzw3qFtkbdPZcQTcPape9kQtxbmJ55t1kgReUfMF4EiV54/8Kx0r5jlZ E5M5PXEUP7rDIYUJkM0rGmouTMtEHWwOJ+ynDz1wUswpUSP3bQBn0k+32Pt9ibbzWAnF uky/bA/m0+J981SC7RZxMXDza9f09JdcREW8A= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=K5TzbTrk8T7PlYc7NzJF75AAXgSC4lo76yDoobNiRvc=; b=Hen1z8Z4sUrSCk88mT/gDyvpMJOXR21jg4/GdLi9jbjuXdmTDJ1CEPb6l5O29X8rfJ /b0Eo1txY7RovKktikuLzWzN6G8ear12nkr2tv4yuLpzznPEolji39LeVxHaEA/1hqYP ByBM69fUW+oXrf5yTGonCa29iDzE3hQOIKU9qi0e4ch7pUO9POm1Qtu49PG/PnYKb9A2 vWaMvvI1VSc7Fv3zBvyb6OI7HdJE5XJ/tBXmKpmxXSi4WlkmIrkJVHOeEpG1oeztSBi7 9/WL6ktiM66UytQ7LEIgsh7GZbooCkY7U2DpCySCTW7UBS0RuUpG+XKSAi6An56TwV1S IXWQ== X-Received: by 10.194.58.113 with SMTP id p17mr3744000wjq.27.1358958322680; Wed, 23 Jan 2013 08:25:22 -0800 (PST) Received: from gina.ffwll.local (178-83-130-250.dynamic.hispeed.ch. [178.83.130.250]) by mx.google.com with ESMTPS id bz12sm30290212wib.5.2013.01.23.08.25.21 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 23 Jan 2013 08:25:22 -0800 (PST) From: Daniel Vetter To: Dave Airlie Subject: [PATCH 2/2] drm/i915: fixup per-crtc locking in intel_release_load_detect_pipe Date: Wed, 23 Jan 2013 17:25:09 +0100 Message-Id: <1358958309-5342-3-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1358958309-5342-1-git-send-email-daniel.vetter@ffwll.ch> References: <1358958309-5342-1-git-send-email-daniel.vetter@ffwll.ch> X-Gm-Message-State: ALoCoQm4NxzexKPq6Rmi++bg4jWt8WSu6ApDSr+/mrVQQ1X5qoeCoI1KX3ghx09PP93jN9Dsur8J Cc: Daniel Vetter , Intel Graphics Development , linux-fbdev-devel@lists.sourceforge.net, LKML , DRI Development 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: , MIME-Version: 1.0 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 One of the early return cases missed the mutex unlocking. Hilarity ensued. This regression has been introduced in commit 7b24056be6db7ce907baffdd4cf142ab774ea60c Author: Daniel Vetter Date: Wed Dec 12 00:35:33 2012 +0100 drm: don't hold crtc mutexes for connector ->detect callbacks Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=59750 Signed-off-by: Daniel Vetter Tested-by: Cancan Feng --- drivers/gpu/drm/i915/intel_display.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 26df9e3..ece4afd 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -6522,6 +6522,7 @@ void intel_release_load_detect_pipe(struct drm_connector *connector, drm_framebuffer_unreference(old->release_fb); } + mutex_unlock(&crtc->mutex); return; }