| Message ID | 20170215160943.26504-2-perex@perex.cz (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, 15 Feb 2017 17:09:43 +0100, Jaroslav Kysela wrote: > > It seems that newer Intel chipsets have more than 15 I/O streams (total). > This patch forces the separate stream tags, when this hardware is detected > to avoid SDxCTL.STRM field overflow and an unexpected behaviour. > > Signed-off-by: Jaroslav Kysela <perex@perex.cz> It's a good idea. Applied now. thanks, Takashi
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 7d77bb5..16108f0e 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -1778,6 +1778,14 @@ static int azx_first_init(struct azx *chip) chip->playback_index_offset = chip->capture_streams; chip->num_streams = chip->playback_streams + chip->capture_streams; + /* sanity check for the SDxCTL.STRM field overflow */ + if (chip->num_streams > 15 && + (chip->driver_caps & AZX_DCAPS_SEPARATE_STREAM_TAG) == 0) { + dev_warn(chip->card->dev, "number of I/O streams is %d, " + "forcing separate stream tags", chip->num_streams); + chip->driver_caps |= AZX_DCAPS_SEPARATE_STREAM_TAG; + } + /* initialize streams */ err = azx_init_streams(chip); if (err < 0)
It seems that newer Intel chipsets have more than 15 I/O streams (total). This patch forces the separate stream tags, when this hardware is detected to avoid SDxCTL.STRM field overflow and an unexpected behaviour. Signed-off-by: Jaroslav Kysela <perex@perex.cz> --- sound/pci/hda/hda_intel.c | 8 ++++++++ 1 file changed, 8 insertions(+)