Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.debian.bugs.rc > #259338

Bug#931507: [PATCHv2] hda: Fix 1-minute detection delay when i915 module is not available

From Samuel Thibault <samuel.thibault@ens-lyon.org>
Newsgroups linux.debian.bugs.rc
Subject Bug#931507: [PATCHv2] hda: Fix 1-minute detection delay when i915 module is not available
Date 2019-07-27 00:00 +0200
Message-ID <yogpQ-2NH-3@gated-at.bofh.it> (permalink)
References <yh1cd-1Pc-1@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw


Distribution installation images such as Debian include different sets
of modules which can be downloaded dynamically.  Such images may notably
include the hda sound modules but not the i915 DRM module, even if the
latter was enabled at build time, as reported on
https://bugs.debian.org/931507

In such a case hdac_i915 would be linked in and try to load the i915
module, fail since it is not there, but still wait for a whole minute
before giving up binding with it.

This fixes such as case by only waiting for the binding if the module
was properly loaded (or module support is disabled, in which case i915
is already compiled-in anyway).

Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
---
 sound/hda/hdac_i915.c |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

--- a/sound/hda/hdac_i915.c
+++ b/sound/hda/hdac_i915.c
@@ -136,10 +136,13 @@ int snd_hdac_i915_init(struct hdac_bus *
 	if (!acomp)
 		return -ENODEV;
 	if (!acomp->ops) {
-		request_module("i915");
-		/* 60s timeout */
-		wait_for_completion_timeout(&bind_complete,
-					    msecs_to_jiffies(60 * 1000));
+		if (!IS_ENABLED(CONFIG_MODULES) ||
+		    !request_module("i915"))
+		{
+			/* 60s timeout */
+			wait_for_completion_timeout(&bind_complete,
+						   msecs_to_jiffies(60 * 1000));
+		}
 	}
 	if (!acomp->ops) {
 		dev_info(bus->dev, "couldn't bind with audio component\n");

Back to linux.debian.bugs.rc | Previous | NextPrevious in thread | Next in thread | Find similar | Unroll thread


Thread

Bug#931507: kernel-wedge: HDA sound board detection takes 60s in d-i Samuel Thibault <sthibault@debian.org> - 2019-07-07 00:20 +0200
  Bug#931507: kernel-wedge: HDA sound board detection takes 60s in d-i Samuel Thibault <sthibault@debian.org> - 2019-07-07 17:30 +0200
    Bug#931507: kernel-wedge: HDA sound board detection takes 60s in d-i Ben Hutchings <ben@decadent.org.uk> - 2019-07-07 18:40 +0200
      Bug#931507: kernel-wedge: HDA sound board detection takes 60s in d-i Samuel Thibault <sthibault@debian.org> - 2019-07-07 18:50 +0200
        Bug#931507: kernel-wedge: HDA sound board detection takes 60s in d-i Ben Hutchings <ben@decadent.org.uk> - 2019-07-07 19:50 +0200
      Bug#931507: kernel-wedge: HDA sound board detection takes 60s in d-i Samuel Thibault <sthibault@debian.org> - 2019-07-26 17:00 +0200
  Bug#931507: hda: Fix 1-minute detection delay when i915 module is not available Samuel Thibault <samuel.thibault@ens-lyon.org> - 2019-07-26 17:10 +0200
  Bug#931507: [PATCHv2] hda: Fix 1-minute detection delay when i915 module is not available Samuel Thibault <samuel.thibault@ens-lyon.org> - 2019-07-27 00:00 +0200
  Bug#931507: marked as done (kernel-wedge: HDA sound board  detection takes 60s in d-i) "Debian Bug Tracking System" <owner@bugs.debian.org> - 2019-08-10 00:40 +0200

csiph-web