Patch "ALSA: hda - Merge RIRB_PRE_DELAY into CTX_WORKAROUND caps" has been added to the 4.4-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
ALSA: hda - Merge RIRB_PRE_DELAY into CTX_WORKAROUND caps
to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
alsa-hda-merge-rirb_pre_delay-into-ctx_workaround-caps.patch
and it can be found in the queue-4.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
ef85f299c74e6c5dd98ec0230183be33f4c2813dMon Sep 17 00:00:00 2001
From: Takashi Iwai <[email protected]>
Date: Thu, 17 Dec 2015 08:12:37 +0100
Subject: ALSA: hda - Merge RIRB_PRE_DELAY into CTX_WORKAROUND caps
From: Takashi Iwai <[email protected]>
commit ef85f299c74e6c5dd98ec0230183be33f4c2813d upstream.
AZX_DCAPS_RIRB_PRE_DELAY is always tied with AZX_DCAPS_CTX_WORKAROUND, which is Creative's XFi specific. So, we can replace it and reduce one more bit free for DCAPS.
--- sound/pci/hda/hda_controller.c | 2 +- sound/pci/hda/hda_controller.h | 2 +- sound/pci/hda/hda_intel.c | 6 ++---- 3 files changed, 4 insertions(+), 6 deletions(-)
sound/pci/hda/hda_controller.c +1 -1
@@ -956,7 +956,7 @@ irqreturn_t azx_interrupt(int irq, void status =azx_readb (chip,RIRBSTS );if (status &RIRB_INT_MASK ) {if (status &RIRB_INT_RESPONSE ) { -if (chip->driver_caps &AZX_DCAPS_RIRB_PRE_DELAY ) +if (chip->driver_caps &AZX_DCAPS_CTX_WORKAROUND )udelay (80 );snd_hdac_bus_update_rirb (bus); }
sound/pci/hda/hda_controller.h +1 -1
@@ -33,7 +33,7 @@#define AZX_DCAPS_SNOOP_MASK (3 << 10)/* snoop type mask */ #define AZX_DCAPS_SNOOP_OFF (1 << 12)/* snoop default off */ #define AZX_DCAPS_RIRB_DELAY (1 << 13)/* Long delay in read loop */ -#define AZX_DCAPS_RIRB_PRE_DELAY (1 << 14)/* Put a delay before read */ +/* 14 unused */ #define AZX_DCAPS_CTX_WORKAROUND (1 << 15)/* X-Fi workaround */ #define AZX_DCAPS_POSFIX_LPIB (1 << 16)/* Use LPIB as default */ #define AZX_DCAPS_POSFIX_VIA (1 << 17)/* Use VIACOMBO as default */
sound/pci/hda/hda_intel.c +2 -4
@@ -2406,14 +2406,12 @@ static const struct pci_device_id azx_id .class = PCI_CLASS_MULTIMEDIA_HD_AUDIO << 8, .class_mask = 0xffffff, .driver_data = AZX_DRIVER_CTX | AZX_DCAPS_CTX_WORKAROUND | - AZX_DCAPS_NO_64BIT | - AZX_DCAPS_RIRB_PRE_DELAY | AZX_DCAPS_POSFIX_LPIB }, + AZX_DCAPS_NO_64BIT | AZX_DCAPS_POSFIX_LPIB },#else /* this entry seems still valid -- i.e. without emu20kx chip */ { PCI_DEVICE(0x1102, 0x0009), .driver_data =AZX_DRIVER_CTX |AZX_DCAPS_CTX_WORKAROUND | -AZX_DCAPS_NO_64BIT | - AZX_DCAPS_RIRB_PRE_DELAY | AZX_DCAPS_POSFIX_LPIB }, + AZX_DCAPS_NO_64BIT | AZX_DCAPS_POSFIX_LPIB }, #endif /* CM8888 */ { PCI_DEVICE(0x13f6, 0x5011),
Patches currently in stable-queue which might be from [email protected] are
queue-4.4/alsa-hda-adding-a-new-group-of-pin-cfg-into-alc295-pin-quirk-table.patch queue-4.4/alsa-hda-fix-headset-mic-detection-problem-for-two-dell-laptops.patch queue-4.4/alsa-hda-merge-rirb_pre_delay-into-ctx_workaround-caps.patch queue-4.4/alsa-hda-allow-40-bit-dma-mask-for-nvidia-devices.patch queue-4.4/alsa-hda-raise-azx_dcaps_rirb_delay-handling-into-top-drivers.patch queue-4.4/alsa-usb-audio-add-quirk-for-syntek-stk1160.patch