Skip to content

Commit 8e85def

Browse files
kv2019itiwai
authored andcommitted
ALSA: hda: enable regmap internal locking
This reverts commit 42ec336 ("ALSA: hda: Disable regmap internal locking"). Without regmap locking, there is a race between snd_hda_codec_amp_init() and PM callbacks issuing regcache_sync(). This was caught by following kernel warning trace: <4> [358.080081] WARNING: CPU: 2 PID: 4157 at drivers/base/regmap/regcache.c:498 regcache_cache_only+0xf5/0x130 [...] <4> [358.080148] Call Trace: <4> [358.080158] snd_hda_codec_amp_init+0x4e/0x100 [snd_hda_codec] <4> [358.080169] snd_hda_codec_amp_init_stereo+0x40/0x80 [snd_hda_codec] Suggested-by: Takashi Iwai <[email protected]> BugLink: https://gitlab.freedesktop.org/drm/intel/issues/592 Signed-off-by: Kai Vehmanen <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Takashi Iwai <[email protected]>
1 parent 54a6a7d commit 8e85def

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

sound/hda/hdac_regmap.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,6 @@ static const struct regmap_config hda_regmap_cfg = {
363363
.reg_write = hda_reg_write,
364364
.use_single_read = true,
365365
.use_single_write = true,
366-
.disable_locking = true,
367366
};
368367

369368
/**

0 commit comments

Comments
 (0)