renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-25 05:34:00 +08:00
Code

ALSA: hda: move polling_mode flag to struct hdac_bus

Browse Source 
polling mode is a useful function in the get_response function. Move
polling_mode flag from struct azx to struct hdac_bus so people can
implement polling mode in their own get_response function without
adding a polling_mode flag in their local chip structure.

Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Bard Liao 2019-05-27 00:58:34 +08:00 committed by Takashi Iwai
parent bd2956e40e
commit 8af42130b5
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/sound/hdaudio.h
View File

@ -358,6 +358,9 @@ struct hdac_bus {
bool align_bdle_4k:1; /* BDLE align 4K boundary */ bool align_bdle_4k:1; /* BDLE align 4K boundary */
bool reverse_assign:1; /* assign devices in reverse order */ bool reverse_assign:1; /* assign devices in reverse order */
bool corbrp_self_clear:1; /* CORBRP clears itself after reset */ bool corbrp_self_clear:1; /* CORBRP clears itself after reset */
bool polling_mode:1;
int poll_count;
int bdl_pos_adj; /* BDL position adjustment */ int bdl_pos_adj; /* BDL position adjustment */

12
sound/pci/hda/hda_controller.c
View File

@ -806,11 +806,11 @@ static int azx_rirb_get_response(struct hdac_bus *bus, unsigned int addr,
for (loopcounter = 0;; loopcounter++) { for (loopcounter = 0;; loopcounter++) {
spin_lock_irq(&bus->reg_lock); spin_lock_irq(&bus->reg_lock);
if (chip->polling_mode || do_poll) if (bus->polling_mode || do_poll)
snd_hdac_bus_update_rirb(bus); snd_hdac_bus_update_rirb(bus);
if (!bus->rirb.cmds[addr]) { if (!bus->rirb.cmds[addr]) {
if (!do_poll) if (!do_poll)
chip->poll_count = 0; bus->poll_count = 0;
if (res) if (res)
*res = bus->rirb.res[addr]; /* the last value */ *res = bus->rirb.res[addr]; /* the last value */
spin_unlock_irq(&bus->reg_lock); spin_unlock_irq(&bus->reg_lock);
@ -830,21 +830,21 @@ static int azx_rirb_get_response(struct hdac_bus *bus, unsigned int addr,
if (hbus->no_response_fallback) if (hbus->no_response_fallback)
return -EIO; return -EIO;
if (!chip->polling_mode && chip->poll_count < 2) { if (!bus->polling_mode && bus->poll_count < 2) {
dev_dbg(chip->card->dev, dev_dbg(chip->card->dev,
"azx_get_response timeout, polling the codec once: last cmd=0x%08x\n", "azx_get_response timeout, polling the codec once: last cmd=0x%08x\n",
bus->last_cmd[addr]); bus->last_cmd[addr]);
do_poll = 1; do_poll = 1;
chip->poll_count++; bus->poll_count++;
goto again; goto again;
} }
if (!chip->polling_mode) { if (!bus->polling_mode) {
dev_warn(chip->card->dev, dev_warn(chip->card->dev,
"azx_get_response timeout, switching to polling mode: last cmd=0x%08x\n", "azx_get_response timeout, switching to polling mode: last cmd=0x%08x\n",
bus->last_cmd[addr]); bus->last_cmd[addr]);
chip->polling_mode = 1; bus->polling_mode = 1;
goto again; goto again;
} }

2
sound/pci/hda/hda_controller.h
View File

@ -142,11 +142,9 @@ struct azx {
/* flags */ /* flags */
int bdl_pos_adj; int bdl_pos_adj;
int poll_count;
unsigned int running:1; unsigned int running:1;
unsigned int fallback_to_single_cmd:1; unsigned int fallback_to_single_cmd:1;
unsigned int single_cmd:1; unsigned int single_cmd:1;
unsigned int polling_mode:1;
unsigned int msi:1; unsigned int msi:1;
unsigned int probing:1; /* codec probing phase */ unsigned int probing:1; /* codec probing phase */
unsigned int snoop:1; unsigned int snoop:1;

2
sound/pci/hda/hda_intel.c
View File

@ -1710,7 +1710,7 @@ static int azx_create(struct snd_card *card, struct pci_dev *pci,
/* Workaround for a communication error on CFL (bko#199007) and CNL */ /* Workaround for a communication error on CFL (bko#199007) and CNL */
if (IS_CFL(pci) || IS_CNL(pci)) if (IS_CFL(pci) || IS_CNL(pci))
chip->polling_mode = 1; azx_bus(chip)->polling_mode = 1;
if (chip->driver_type == AZX_DRIVER_NVIDIA) { if (chip->driver_type == AZX_DRIVER_NVIDIA) {
dev_dbg(chip->card->dev, "Enable delay in RIRB handling\n"); dev_dbg(chip->card->dev, "Enable delay in RIRB handling\n");