OSDN Git Service

ASoC: dapm: Recalculate audio map forcely when card instantiated
authorTzung-Bi Shih <tzungbi@google.com>
Wed, 14 Nov 2018 09:06:13 +0000 (17:06 +0800)
committerMark Brown <broonie@kernel.org>
Wed, 14 Nov 2018 22:26:00 +0000 (14:26 -0800)
commit882eab6c28d23a970ae73b7eb831b169a672d456
treed55876fa0887424249cf38738144ca9bd8cd080c
parent76836fd354922ebe4798a64fda01f8dc6a8b0984
ASoC: dapm: Recalculate audio map forcely when card instantiated

Audio map are possible in wrong state before card->instantiated has
been set to true.  Imaging the following examples:

time 1: at the beginning

  in:-1    in:-1    in:-1    in:-1
 out:-1   out:-1   out:-1   out:-1
 SIGGEN        A        B      Spk

time 2: after someone called snd_soc_dapm_new_widgets()
(e.g. create_fill_widget_route_map() in sound/soc/codecs/hdac_hdmi.c)

   in:1     in:0     in:0     in:0
  out:0    out:0    out:0    out:1
 SIGGEN        A        B      Spk

time 3: routes added

   in:1     in:0     in:0     in:0
  out:0    out:0    out:0    out:1
 SIGGEN -----> A -----> B ---> Spk

In the end, the path should be powered on but it did not.  At time 3,
"in" of SIGGEN and "out" of Spk did not propagate to their neighbors
because snd_soc_dapm_add_path() will not invalidate the paths if
the card has not instantiated (i.e. card->instantiated is false).
To correct the state of audio map, recalculate the whole map forcely.

Signed-off-by: Tzung-Bi Shih <tzungbi@google.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/soc-core.c