From mboxrd@z Thu Jan 1 00:00:00 1970 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=-6.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=ham 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 B2B89C43381 for ; Mon, 18 Mar 2019 09:34:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 83AB8214AF for ; Mon, 18 Mar 2019 09:34:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1552901643; bh=LLnHyaca2MKAeXBvB1Lzcq/Di26rB2NMTEV68Q6s0jI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=aEbjSmPxrcezS+Hmuc6tPn1mc0fAcB8VgVmPTlRFrJV8jdZ+YbrmsS6sqARNRQ5rN uhRkHq2x8cPPQzO9woQ/h01cxONQdvCcNNGIG7knUOY2qfSoLKdqdQBWqb3Dv0w7ey 6MNC/ejlL7VGTK8b99fU/TIZqAuWbSzhrT7295BQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728945AbfCRJeB (ORCPT ); Mon, 18 Mar 2019 05:34:01 -0400 Received: from mail.kernel.org ([198.145.29.99]:42288 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728921AbfCRJd5 (ORCPT ); Mon, 18 Mar 2019 05:33:57 -0400 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6F9E82087C; Mon, 18 Mar 2019 09:33:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1552901636; bh=LLnHyaca2MKAeXBvB1Lzcq/Di26rB2NMTEV68Q6s0jI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TnYTbyz8jwT9LHre4AwtQ5QKxHEmpjrEpEgy24M9YO/iHS9K4l18+n9umPTDKewcp g4WdLCXNdHbJr72Ha7eQs4Yaow8mAGARN61mqTw7hgbagj4BCXjKq3ZDxGqgcQiYHc 9xf4xlMIqAK5f2EC7cw8YIg23vtWOdgxzLPI6KGk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Paul Menzel , Takashi Iwai Subject: [PATCH 4.19 41/52] ALSA: hda: Extend i915 component bind timeout Date: Mon, 18 Mar 2019 10:25:38 +0100 Message-Id: <20190318084018.361079067@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190318084013.532280682@linuxfoundation.org> References: <20190318084013.532280682@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.19-stable review patch. If anyone has any objections, please let me know. ------------------ From: Takashi Iwai commit cfc35f9c128cea8fce6a5513b1de50d36f3b209f upstream. I set 10 seconds for the timeout of the i915 audio component binding with a hope that recent machines are fast enough to handle all probe tasks in that period, but I was too optimistic. The binding may take longer than that, and this caused a problem on the machine with both audio and graphics driver modules loaded in parallel, as Paul Menzel experienced. This problem haven't hit so often just because the KMS driver is loaded in initrd on most machines. As a simple workaround, extend the timeout to 60 seconds. Fixes: f9b54e1961c7 ("ALSA: hda/i915: Allow delayed i915 audio component binding") Reported-by: Paul Menzel Cc: Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman --- sound/hda/hdac_i915.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/sound/hda/hdac_i915.c +++ b/sound/hda/hdac_i915.c @@ -144,9 +144,9 @@ int snd_hdac_i915_init(struct hdac_bus * return -ENODEV; if (!acomp->ops) { request_module("i915"); - /* 10s timeout */ + /* 60s timeout */ wait_for_completion_timeout(&bind_complete, - msecs_to_jiffies(10 * 1000)); + msecs_to_jiffies(60 * 1000)); } if (!acomp->ops) { dev_info(bus->dev, "couldn't bind with audio component\n");