Commit 68e851ee authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: usb-audio: Move generic DSD raw detection into quirk_flags 

The generic DSD raw detection is based on the known allow list, and we
can integrate it into quirk_flags, too.

Link: https://lore.kernel.org/r/20210729074404.19728-4-tiwai@suse.de


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

sound/usb/quirks.c

+27 −24
Original line number Diff line number Diff line
@@ -1673,29 +1673,9 @@ u64 snd_usb_interface_dsd_format_quirks(struct snd_usb_audio *chip, 
			return SNDRV_PCM_FMTBIT_DSD_U32_BE;

	}



	/* Mostly generic method to detect many DSD-capable implementations -

	 * from XMOS/Thesycon

	 */

	switch (USB_ID_VENDOR(chip->usb_id)) {

	case 0x152a:  /* Thesycon devices */

	case 0x20b1:  /* XMOS based devices */

	case 0x22d9:  /* Oppo */

	case 0x23ba:  /* Playback Designs */

	case 0x25ce:  /* Mytek devices */

	case 0x278b:  /* Rotel? */

	case 0x292b:  /* Gustard/Ess based devices */

	case 0x2972:  /* FiiO devices */

	case 0x2ab6:  /* T+A devices */

	case 0x3353:  /* Khadas devices */

	case 0x3842:  /* EVGA */

	case 0xc502:  /* HiBy devices */

		if (fp->dsd_raw)

	/* Mostly generic method to detect many DSD-capable implementations */

	if ((chip->quirk_flags & QUIRK_FLAG_DSD_RAW) && fp->dsd_raw)

		return SNDRV_PCM_FMTBIT_DSD_U32_BE;

		break;

	default:

		break;



	}



	return 0;

}
@@ -1917,10 +1897,33 @@ static const struct usb_audio_quirk_flags_table quirk_flags_table[] = { 
		   QUIRK_FLAG_CTL_MSG_DELAY | QUIRK_FLAG_IFACE_DELAY),

	VENDOR_FLG(0x07fd, /* MOTU */

		   QUIRK_FLAG_VALIDATE_RATES),

	VENDOR_FLG(0x152a, /* Thesycon devices */

		   QUIRK_FLAG_DSD_RAW),

	VENDOR_FLG(0x1de7, /* Phoenix Audio */

		   QUIRK_FLAG_GET_SAMPLE_RATE),

	VENDOR_FLG(0x20b1, /* XMOS based devices */

		   QUIRK_FLAG_DSD_RAW),

	VENDOR_FLG(0x22d9, /* Oppo */

		   QUIRK_FLAG_DSD_RAW),

	VENDOR_FLG(0x23ba, /* Playback Design */

		   QUIRK_FLAG_CTL_MSG_DELAY | QUIRK_FLAG_IFACE_DELAY),

		   QUIRK_FLAG_CTL_MSG_DELAY | QUIRK_FLAG_IFACE_DELAY |

		   QUIRK_FLAG_DSD_RAW),

	VENDOR_FLG(0x25ce, /* Mytek devices */

		   QUIRK_FLAG_DSD_RAW),

	VENDOR_FLG(0x278b, /* Rotel? */

		   QUIRK_FLAG_DSD_RAW),

	VENDOR_FLG(0x292b, /* Gustard/Ess based devices */

		   QUIRK_FLAG_DSD_RAW),

	VENDOR_FLG(0x2972, /* FiiO devices */

		   QUIRK_FLAG_DSD_RAW),

	VENDOR_FLG(0x2ab6, /* T+A devices */

		   QUIRK_FLAG_DSD_RAW),

	VENDOR_FLG(0x3353, /* Khadas devices */

		   QUIRK_FLAG_DSD_RAW),

	VENDOR_FLG(0x3842, /* EVGA */

		   QUIRK_FLAG_DSD_RAW),

	VENDOR_FLG(0xc502, /* HiBy devices */

		   QUIRK_FLAG_DSD_RAW),



	{} /* terminator */

};

sound/usb/usbaudio.h

+3 −0
Original line number Diff line number Diff line
@@ -159,6 +159,8 @@ extern bool snd_usb_skip_validation; 
 *  Disable runtime PM autosuspend

 * QUIRK_FLAG_IGNORE_CTL_ERROR:

 *  Ignore errors for mixer access

 * QUIRK_FLAG_DSD_RAW:

 *  Support generic DSD raw U32_BE format

 */



#define QUIRK_FLAG_GET_SAMPLE_RATE	(1U << 0)
@@ -176,5 +178,6 @@ extern bool snd_usb_skip_validation; 
#define QUIRK_FLAG_VALIDATE_RATES	(1U << 12)

#define QUIRK_FLAG_DISABLE_AUTOSUSPEND	(1U << 13)

#define QUIRK_FLAG_IGNORE_CTL_ERROR	(1U << 14)

#define QUIRK_FLAG_DSD_RAW		(1U << 15)



#endif /* __USBAUDIO_H */