projects / thirdparty / kernel / stable-queue.git / blame
| Commit | Line | Data |
|---|---|---|
| a15a8890 SL |
1 | From 2e3cce3a33cf83a246d4abc233704bb3815ef91b Mon Sep 17 00:00:00 2001 |
| 2 | From: Bard Liao <yung-chuan.liao@linux.intel.com> | |
| 3 | Date: Mon, 27 May 2019 00:58:32 +0800 | |
| 4 | Subject: ALSA: hda - Force polling mode on CNL for fixing codec communication | |
| 5 | ||
| 6 | [ Upstream commit fa763f1b2858752e6150ffff46886a1b7faffc82 ] | |
| 7 | ||
| 8 | We observed the same issue as reported by commit a8d7bde23e7130686b7662 | |
| 9 | ("ALSA: hda - Force polling mode on CFL for fixing codec communication") | |
| 10 | We don't have a better solution. So apply the same workaround to CNL. | |
| 11 | ||
| 12 | Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com> | |
| 13 | Signed-off-by: Takashi Iwai <tiwai@suse.de> | |
| 14 | Signed-off-by: Sasha Levin <sashal@kernel.org> | |
| 15 | --- | |
| 16 | sound/pci/hda/hda_intel.c | 5 +++-- | |
| 17 | 1 file changed, 3 insertions(+), 2 deletions(-) | |
| 18 | ||
| 19 | diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c | |
| 20 | index 45bf89ed31de..308ce76149cc 100644 | |
| 21 | --- a/sound/pci/hda/hda_intel.c | |
| 22 | +++ b/sound/pci/hda/hda_intel.c | |
| 23 | @@ -378,6 +378,7 @@ enum { | |
| 24 | ||
| 25 | #define IS_BXT(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x5a98) | |
| 26 | #define IS_CFL(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0xa348) | |
| 27 | +#define IS_CNL(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x9dc8) | |
| 28 | ||
| 29 | static char *driver_short_names[] = { | |
| 30 | [AZX_DRIVER_ICH] = "HDA Intel", | |
| 31 | @@ -1795,8 +1796,8 @@ static int azx_create(struct snd_card *card, struct pci_dev *pci, | |
| 32 | else | |
| 33 | chip->bdl_pos_adj = bdl_pos_adj[dev]; | |
| 34 | ||
| 35 | - /* Workaround for a communication error on CFL (bko#199007) */ | |
| 36 | - if (IS_CFL(pci)) | |
| 37 | + /* Workaround for a communication error on CFL (bko#199007) and CNL */ | |
| 38 | + if (IS_CFL(pci) || IS_CNL(pci)) | |
| 39 | chip->polling_mode = 1; | |
| 40 | ||
| 41 | err = azx_bus_init(chip, model[dev], &pci_hda_io_ops); | |
| 42 | -- | |
| 43 | 2.20.1 | |
| 44 |