igt-dev.lists.freedesktop.org archive mirror
 help / color / mirror / Atom feed
* [Intel-gfx] [PATCH i-g-t] lib/pm: Wait a little for sound module load to complete
@ 2018-09-03 12:51 Chris Wilson
  2018-09-03 13:01 ` [igt-dev] " Chris Wilson
                   ` (8 more replies)
  0 siblings, 9 replies; 12+ messages in thread
From: Chris Wilson @ 2018-09-03 12:51 UTC (permalink / raw)
  To: igt-dev; +Cc: intel-gfx, Imre Deak

Sometimes we may probe the sound module as it is still being registered
and its debugfs not yet fully populated. If we do not find a file we
expect to exist, sleep a little and check again.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=107801
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Imre Deak <imre.deak@linux.com>
---
 lib/igt_pm.c | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/lib/igt_pm.c b/lib/igt_pm.c
index 339a51e6f..e383f18b5 100644
--- a/lib/igt_pm.c
+++ b/lib/igt_pm.c
@@ -154,20 +154,28 @@ static int __igt_pm_enable_audio_runtime_pm(void)
 	while ((de = readdir(dir))) {
 		const char *match = "hwC";
 		char buf[32] = { }; /* for Valgrind */
-		char *tmp;
+		int loops = 500;
+		int base;
 		int ret;
 
 		if (de->d_type != DT_LNK ||
 		    strncmp(de->d_name, match, strlen(match)))
 			continue;
 
-		igt_assert(asprintf(&tmp,
-				    "/sys/class/sound/%s/vendor_name",
-				    de->d_name));
+		base = openat(dir, de->d_name, O_RDONLY);
+		igt_assert_fd(base);
+
+		do {
+			fd = open(base, "vendor_name", O_RDONLY);
+			if (fd < 0) /* module is still loading? */
+				usleep(1000);
+			else
+				break;
+		} while (--loops);
+		close(base);
+		if (fd < 0)
+			continue;
 
-		fd = open(tmp, O_RDONLY);
-		free(tmp);
-		igt_assert_fd(fd);
 		ret = read(fd, buf, sizeof(buf));
 		close(fd);
 		igt_assert(ret > 0);
-- 
2.19.0.rc1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2018-09-04 10:06 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-09-03 12:51 [Intel-gfx] [PATCH i-g-t] lib/pm: Wait a little for sound module load to complete Chris Wilson
2018-09-03 13:01 ` [igt-dev] " Chris Wilson
2018-09-03 13:02 ` [Intel-gfx] [PATCH i-g-t v2] " Chris Wilson
2018-09-04 10:00   ` [igt-dev] " Imre Deak
2018-09-04 10:06     ` Chris Wilson
2018-09-03 13:11 ` [igt-dev] ✗ Fi.CI.BAT: failure for " Patchwork
2018-09-03 13:27 ` [igt-dev] ✓ Fi.CI.BAT: success for lib/pm: Wait a little for sound module load to complete (rev2) Patchwork
2018-09-03 13:32 ` [igt-dev] [PATCH i-g-t v3] lib/pm: Wait a little for sound module load to complete Chris Wilson
2018-09-03 14:10 ` [igt-dev] ✓ Fi.CI.BAT: success for lib/pm: Wait a little for sound module load to complete (rev3) Patchwork
2018-09-03 18:16 ` [igt-dev] ✗ Fi.CI.IGT: failure for lib/pm: Wait a little for sound module load to complete Patchwork
2018-09-03 19:00 ` [igt-dev] ✗ Fi.CI.IGT: failure for lib/pm: Wait a little for sound module load to complete (rev2) Patchwork
2018-09-03 20:32 ` [igt-dev] ✓ Fi.CI.IGT: success for lib/pm: Wait a little for sound module load to complete (rev3) Patchwork

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).