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

Commit 1dac6695 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: hda - Allow to pass position_fix=0 explicitly 



Set the default value of position_fix -1, and allow user passing
position_fix=0 explicitly to set the "auto" position-fix mode.
Otherwise the auto mode may be switched to others like COMBO of
VIACOMBO when the controller prefers it, thus user can't set the auto
mode any longer.

Also updated the documentation appropriately, too.

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

Documentation/sound/alsa/ALSA-Configuration.txt

+8 −2
Original line number Diff line number Diff line
@@ -860,8 +860,14 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 


    [Multiple options for each card instance]

    model	- force the model name

    position_fix - Fix DMA pointer (0 = auto, 1 = use LPIB, 2 = POSBUF,

    		   3 = VIACOMBO, 4 = COMBO)

    position_fix - Fix DMA pointer

		  -1 = system default: choose appropriate one per controller

			hardware

		  0 = auto: falls back to LPIB when POSBUF doesn't work

		  1 = use LPIB

		  2 = POSBUF: use position buffer

		  3 = VIACOMBO: VIA-specific workaround for capture

		  4 = COMBO: use LPIB for playback, auto for capture stream

    probe_mask  - Bitmask to probe codecs (default = -1, meaning all slots)

    		  When the bit 8 (0x100) is set, the lower 8 bits are used

		  as the "fixed" codec slots; i.e. the driver probes the

sound/pci/hda/hda_intel.c

+3 −2
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; 
static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;

static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;

static char *model[SNDRV_CARDS];

static int position_fix[SNDRV_CARDS];

static int position_fix[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS-1)] = -1};

static int bdl_pos_adj[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS-1)] = -1};

static int probe_mask[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS-1)] = -1};

static int probe_only[SNDRV_CARDS];
@@ -88,7 +88,7 @@ module_param_array(model, charp, NULL, 0444); 
MODULE_PARM_DESC(model, "Use the given board model.");

module_param_array(position_fix, int, NULL, 0444);

MODULE_PARM_DESC(position_fix, "DMA pointer read method."

		 "(0 = auto, 1 = LPIB, 2 = POSBUF, 3 = VIACOMBO, 4 = COMBO).");

		 "(-1 = system default, 0 = auto, 1 = LPIB, 2 = POSBUF, 3 = VIACOMBO, 4 = COMBO).");

module_param_array(bdl_pos_adj, int, NULL, 0644);

MODULE_PARM_DESC(bdl_pos_adj, "BDL position adjustment offset.");

module_param_array(probe_mask, int, NULL, 0444);
@@ -2813,6 +2813,7 @@ static int __devinit check_position_fix(struct azx *chip, int fix) 
	const struct snd_pci_quirk *q;



	switch (fix) {

	case POS_FIX_AUTO:

	case POS_FIX_LPIB:

	case POS_FIX_POSBUF:

	case POS_FIX_VIACOMBO: