From patchwork Mon Aug 5 10:29:16 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 2838628 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.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 9E1DBBF535 for ; Mon, 5 Aug 2013 10:29:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5938A2010A for ; Mon, 5 Aug 2013 10:29:33 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id DF43120109 for ; Mon, 5 Aug 2013 10:29:31 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D2E0DE6AEB for ; Mon, 5 Aug 2013 03:29:31 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ob0-f181.google.com (mail-ob0-f181.google.com [209.85.214.181]) by gabe.freedesktop.org (Postfix) with ESMTP id 44735E60A9 for ; Mon, 5 Aug 2013 03:29:17 -0700 (PDT) Received: by mail-ob0-f181.google.com with SMTP id dn14so5135554obc.40 for ; Mon, 05 Aug 2013 03:29:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=mime-version:x-originating-ip:in-reply-to:references:date :message-id:subject:from:to:cc:content-type; bh=DESfbBz4fFchTpJtdDz1tdgYjYv5GSQ3DuS5ssuD3X0=; b=Hv+DkBrqmd/vvMKTL0JgfQq5XUQ6BOjXEjqzg7xnboehpApC0HdzuTQkDQTi/8H/pI E5ciPfcLulfdTqP2TihajCIb/CotLXKcbTo3GeukQ39AkTQ887Ry89eJdMumYDkhjz43 AipPVKm0UWRs8tQfdDx7B0kr+BMpcKIxzCEns= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:x-originating-ip:in-reply-to:references:date :message-id:subject:from:to:cc:content-type:x-gm-message-state; bh=DESfbBz4fFchTpJtdDz1tdgYjYv5GSQ3DuS5ssuD3X0=; b=d3/OlLi9DY2dTzv2ilUw8IE1n6U3tMAV+Ov/MgbtAVrHOvsN6zKfSxpiSHpqm2bTj4 qP/HcZNp3WhAtx7wVuwlGJdg9vfmwiDs0V79rPFcZ718HOJ36CN8Aito9B+98EqXJnn0 Q3kOaarVsj8wavEhwLq7XFibm+vo/LPlylhzfuY7BiF69G5eUW5okLhrWH+tV1ElF5vJ jD/75uydVIj5nqeYeKgNFztAUYuinvVJD+q9jEKDYySE4zUkK6GThUaqjMRFIwRZIuR+ w1bojGk+iVx39ErjXlOooNkKQDegRYtASGXTBt3F5MAxhf9yXOiZuISf1Rdr7KmX8zaT nD5w== MIME-Version: 1.0 X-Received: by 10.50.44.18 with SMTP id a18mr80829igm.20.1375698556503; Mon, 05 Aug 2013 03:29:16 -0700 (PDT) Received: by 10.42.28.9 with HTTP; Mon, 5 Aug 2013 03:29:16 -0700 (PDT) X-Originating-IP: [178.83.130.250] In-Reply-To: <20130805094744.GM5102@mwanda> References: <20130805094744.GM5102@mwanda> Date: Mon, 5 Aug 2013 12:29:16 +0200 Message-ID: From: Daniel Vetter To: Dan Carpenter X-Gm-Message-State: ALoCoQmY7jEGuPoRC203Zc52yKzjQJ3reSQdLmeCPiUOE626ah695FsdAGHXY9KKlw/mHF0ugmFc Cc: "Nikula, Jani" , Julia Lawall , intel-gfx , kbuild@01.org Subject: Re: [Intel-gfx] [kbuild] [drm-intel:drm-intel-nightly 20/35] drivers/gpu/drm/i915/intel_hdmi.c:1067:1-11: second lock on line 1086 X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org X-Spam-Status: No, score=-4.1 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 Thanks for the report, I'll squash in the following fixup: commit 36bf63c19eb46631fa4556ae54d91a5320a198b2 Author: Daniel Vetter Date: Mon Aug 5 12:28:03 2013 +0200 fixup, reported by Dan Carpenter and his coccinelle checker static void intel_hdmi_post_disable(struct intel_encoder *encoder) Cheers, Daniel On Mon, Aug 5, 2013 at 11:47 AM, Dan Carpenter wrote: > Hi Chris, > > FYI, there are coccinelle warnings in > > tree: git://people.freedesktop.org/~danvet/drm-intel.git drm-intel-nightly > head: ae8f8cd50423690c4970cab6c27d4b983c12636f > commit: 2f5baa2f10f31ad0ba9bfe9993fc1691eb624f2e [20/35] drm/i915: Acquire dpio_lock for VLV sideband programming in DP/HDMI > >>> drivers/gpu/drm/i915/intel_hdmi.c:1067:1-11: second lock on line 1086 > > git remote add drm-intel git://people.freedesktop.org/~danvet/drm-intel.git > git remote update drm-intel > git checkout 2f5baa2f10f31ad0ba9bfe9993fc1691eb624f2e > vim +1067 drivers/gpu/drm/i915/intel_hdmi.c > > 89b667f8 Jesse Barnes 2013-04-18 1061 int port = vlv_dport_to_channel(dport); > 89b667f8 Jesse Barnes 2013-04-18 1062 > 89b667f8 Jesse Barnes 2013-04-18 1063 if (!IS_VALLEYVIEW(dev)) > 89b667f8 Jesse Barnes 2013-04-18 1064 return; > 89b667f8 Jesse Barnes 2013-04-18 1065 > 89b667f8 Jesse Barnes 2013-04-18 1066 /* Program Tx lane resets to default */ > 2f5baa2f Chris Wilson 2013-07-26 @1067 mutex_lock(&dev_priv->dpio_lock); > ae99258f Jani Nikula 2013-05-22 1068 vlv_dpio_write(dev_priv, DPIO_PCS_TX(port), > 89b667f8 Jesse Barnes 2013-04-18 1069 DPIO_PCS_TX_LANE2_RESET | > 89b667f8 Jesse Barnes 2013-04-18 1070 DPIO_PCS_TX_LANE1_RESET); > ae99258f Jani Nikula 2013-05-22 1071 vlv_dpio_write(dev_priv, DPIO_PCS_CLK(port), > 89b667f8 Jesse Barnes 2013-04-18 1072 DPIO_PCS_CLK_CRI_RXEB_EIOS_EN | > 89b667f8 Jesse Barnes 2013-04-18 1073 DPIO_PCS_CLK_CRI_RXDIGFILTSG_EN | > 89b667f8 Jesse Barnes 2013-04-18 1074 (1< 89b667f8 Jesse Barnes 2013-04-18 1075 DPIO_PCS_CLK_SOFT_RESET); > 89b667f8 Jesse Barnes 2013-04-18 1076 > 89b667f8 Jesse Barnes 2013-04-18 1077 /* Fix up inter-pair skew failure */ > ae99258f Jani Nikula 2013-05-22 1078 vlv_dpio_write(dev_priv, DPIO_PCS_STAGGER1(port), 0x00750f00); > ae99258f Jani Nikula 2013-05-22 1079 vlv_dpio_write(dev_priv, DPIO_TX_CTL(port), 0x00001500); > ae99258f Jani Nikula 2013-05-22 1080 vlv_dpio_write(dev_priv, DPIO_TX_LANE(port), 0x40400000); > 89b667f8 Jesse Barnes 2013-04-18 1081 > ae99258f Jani Nikula 2013-05-22 1082 vlv_dpio_write(dev_priv, DPIO_PCS_CTL_OVER1(port), > 89b667f8 Jesse Barnes 2013-04-18 1083 0x00002000); > ae99258f Jani Nikula 2013-05-22 1084 vlv_dpio_write(dev_priv, DPIO_TX_OCALINIT(port), > 89b667f8 Jesse Barnes 2013-04-18 1085 DPIO_TX_OCALINIT_EN); > 2f5baa2f Chris Wilson 2013-07-26 @1086 mutex_lock(&dev_priv->dpio_lock); > 89b667f8 Jesse Barnes 2013-04-18 1087 } > 89b667f8 Jesse Barnes 2013-04-18 1088 > 89b667f8 Jesse Barnes 2013-04-18 1089 static void intel_hdmi_post_disable(struct intel_encoder *encoder) > > --- > 0-DAY kernel build testing backend Open Source Technology Center > http://lists.01.org/mailman/listinfo/kbuild Intel Corporation > _______________________________________________ > kbuild mailing list > kbuild@lists.01.org > https://lists.01.org/mailman/listinfo/kbuild diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c index 4092e7f..5cad59f 100644 --- a/drivers/gpu/drm/i915/intel_hdmi.c +++ b/drivers/gpu/drm/i915/intel_hdmi.c @@ -1083,7 +1083,7 @@ static void intel_hdmi_pre_pll_enable(struct intel_encoder *encoder) 0x00002000); vlv_dpio_write(dev_priv, DPIO_TX_OCALINIT(port), DPIO_TX_OCALINIT_EN); - mutex_lock(&dev_priv->dpio_lock); + mutex_unlock(&dev_priv->dpio_lock); }