Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6E669C433E0 for ; Fri, 1 Jan 2021 07:59:01 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6CD9D21D95 for ; Fri, 1 Jan 2021 07:58:59 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6CD9D21D95 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 648AF1731; Fri, 1 Jan 2021 08:58:05 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 648AF1731 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1609487935; bh=Fch/Nzfv62kEp23BAOEtJJmOfV8bZGPmh2hlHrp+b0U=; h=Date:From:To:Subject:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=V9SeId5qcB7NPjgWh1YfMCgstwKLKOWN/04HV4X0XN/X7tCoepYZZh+Qv+SkBwyAC n3tkZgXPKoOtINn6Z6zWwvZ0T7dIHeNdWz3bbXUYKQtgwbvdVpAqZr0kM3PS8SMDJu q/+RzFwfg7PYdshLgayBDfmB/X8Eif45vFDbo2zU= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id BBC8EF8015F; Fri, 1 Jan 2021 08:58:04 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 80C7AF801F5; Fri, 1 Jan 2021 08:58:02 +0100 (CET) Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 34302F8015F for ; Fri, 1 Jan 2021 08:57:56 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 34302F8015F X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 8C6E2AD09; Fri, 1 Jan 2021 07:57:56 +0000 (UTC) Date: Fri, 01 Jan 2021 08:57:56 +0100 Message-ID: From: Takashi Iwai To: "Jan Alexander Steffens (heftig)" Subject: Re: [PATCH v2] ALSA: hda/hdmi: fix silent stream for first playback to DP In-Reply-To: References: <20201210174445.3134104-1-kai.vehmanen@linux.intel.com> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/25.3 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Harsha Priya , Emmanuel Jillela , alsa-devel@alsa-project.org, Kai Vehmanen X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" On Fri, 01 Jan 2021 06:15:42 +0100, Jan Alexander Steffens (heftig) wrote: > > On Thu, 2020-12-10 at 19:44 +0200, Kai Vehmanen wrote: > > +static void silent_stream_disable(struct hda_codec *codec, > > +                                 struct hdmi_spec_per_pin *per_pin) > > +{ > > +       struct hdmi_spec *spec = codec->spec; > > +       struct hdmi_spec_per_cvt *per_cvt; > > +       int cvt_idx; > > + > > +       mutex_lock(&per_pin->lock); > > +       if (!per_pin->silent_stream) > > +               goto unlock_out; > > + > > +       codec_dbg(codec, "HDMI: disable silent stream on pin-NID=0x%x > > cvt-NID=0x%x\n", > > +                 per_pin->pin_nid, per_pin->cvt_nid); > > + > > +       cvt_idx = cvt_nid_to_cvt_index(codec, per_pin->cvt_nid); > > +       if (cvt_idx >= 0 && cvt_idx < spec->num_cvts) { > > +               per_cvt = get_cvt(spec, cvt_idx); > > +               per_cvt->assigned = 0; > > +       } > > + > > +       per_pin->cvt_nid = 0; > > +       per_pin->silent_stream = false; > > + > > + unlock_out: > > +       mutex_unlock(&spec->pcm_lock); > > Shouldn't this be `mutex_unlock(&per_pin->lock);`? Oh yes, obviously. > I'm experiencing deadlocks since 5.10.4, which backported this patch. Could you check whether correcting the unlock fixes the problem? thanks, Takashi