Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 21a164df authored by Adrian Knoth's avatar Adrian Knoth Committed by Takashi Iwai
Browse files

ALSA: hdspm - Report external rate in slave mode on PCI MADI 



As a follow-up to a97bda7d, report the
external sample rate as system_sample_rate when in slave mode.

For PCIe MADI cards, the DDS value automatically contains the external
sample rate, but the PCI version needs this manual workaround.

Signed-off-by: default avatarAdrian Knoth <adi@drcomp.erfurt.thur.de>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 41285a98

sound/pci/rme9652/hdspm.c

+9 −4
Original line number Diff line number Diff line
@@ -971,6 +971,7 @@ static inline void snd_hdspm_initialize_midi_flush(struct hdspm *hdspm); 
static int hdspm_update_simple_mixer_controls(struct hdspm *hdspm);

static int hdspm_autosync_ref(struct hdspm *hdspm);

static int snd_hdspm_set_defaults(struct hdspm *hdspm);

static int hdspm_system_clock_mode(struct hdspm *hdspm);

static void hdspm_set_sgbuf(struct hdspm *hdspm,

			    struct snd_pcm_substream *substream,

			     unsigned int reg, int channels);
@@ -1989,10 +1990,14 @@ static int hdspm_get_system_sample_rate(struct hdspm *hdspm) 
	rate = hdspm_calc_dds_value(hdspm, period);



	if (rate > 207000) {

		/* Unreasonable high sample rate as seen on PCI MADI cards.

		 * Use the cached value instead.

		 */

		/* Unreasonable high sample rate as seen on PCI MADI cards. */

		if (0 == hdspm_system_clock_mode(hdspm)) {

			/* master mode, return internal sample rate */

			rate = hdspm->system_sample_rate;

		} else {

			/* slave mode, return external sample rate */

			rate = hdspm_external_sample_rate(hdspm);

		}

	}



	return rate;