Commit ef85f299 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: hda - Merge RIRB_PRE_DELAY into CTX_WORKAROUND caps 



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.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent f2777c13

sound/pci/hda/hda_controller.c

+1 −1
Original line number Diff line number Diff line
@@ -956,7 +956,7 @@ irqreturn_t azx_interrupt(int irq, void *dev_id) 
	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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -2314,14 +2314,12 @@ static const struct pci_device_id azx_ids[] = { 
	  .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),

CRA Git | Maintained and supported by SUSTech CRA and CCSE