queue-4.20/alsa-hda-extend-i915-component-bind-timeout.patch

   1 From cfc35f9c128cea8fce6a5513b1de50d36f3b209f Mon Sep 17 00:00:00 2001
   2 From: Takashi Iwai <tiwai@suse.de>
   3 Date: Mon, 25 Feb 2019 16:49:27 +0100
   4 Subject: ALSA: hda: Extend i915 component bind timeout
   5
   6 From: Takashi Iwai <tiwai@suse.de>
   7
   8 commit cfc35f9c128cea8fce6a5513b1de50d36f3b209f upstream.
   9
  10 I set 10 seconds for the timeout of the i915 audio component binding
  11 with a hope that recent machines are fast enough to handle all probe
  12 tasks in that period, but I was too optimistic.  The binding may take
  13 longer than that, and this caused a problem on the machine with both
  14 audio and graphics driver modules loaded in parallel, as Paul Menzel
  15 experienced.  This problem haven't hit so often just because the KMS
  16 driver is loaded in initrd on most machines.
  17
  18 As a simple workaround, extend the timeout to 60 seconds.
  19
  20 Fixes: f9b54e1961c7 ("ALSA: hda/i915: Allow delayed i915 audio component binding")
  21 Reported-by: Paul Menzel <pmenzel+alsa-devel@molgen.mpg.de>
  22 Cc: <stable@vger.kernel.org>
  23 Signed-off-by: Takashi Iwai <tiwai@suse.de>
  24 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  25
  26 ---
  27  sound/hda/hdac_i915.c |    4 ++--
  28  1 file changed, 2 insertions(+), 2 deletions(-)
  29
  30 --- a/sound/hda/hdac_i915.c
  31 +++ b/sound/hda/hdac_i915.c
  32 @@ -144,9 +144,9 @@ int snd_hdac_i915_init(struct hdac_bus *
  33                 return -ENODEV;
  34         if (!acomp->ops) {
  35                 request_module("i915");
  36 -               /* 10s timeout */
  37 +               /* 60s timeout */
  38                 wait_for_completion_timeout(&bind_complete,
  39 -                                           msecs_to_jiffies(10 * 1000));
  40 +                                           msecs_to_jiffies(60 * 1000));
  41         }
  42         if (!acomp->ops) {
  43                 dev_info(bus->dev, "couldn't bind with audio component\n");