ALSA: lola - Implement polling_mode like hd-audio

Also protect the call of lola_update_rirb() with spinlock.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/pci/lola/lola.c b/sound/pci/lola/lola.c
index 8ee22bee10c97a706fa2274c2bbe5104868310a4..34b24286d279d542e3d24e80a3531e8cf95bc8f5 100644 (file)
--- a/sound/pci/lola/lola.c
+++ b/sound/pci/lola/lola.c
@@ -153,8 +153,14 @@ static int rirb_get_response(struct lola *chip, unsigned int *val,
 {
        unsigned long timeout;
 
+ again:
        timeout = jiffies + msecs_to_jiffies(1000);
        for (;;) {
+               if (chip->polling_mode) {
+                       spin_lock_irq(&chip->reg_lock);
+                       lola_update_rirb(chip);
+                       spin_unlock_irq(&chip->reg_lock);
+               }
                if (!chip->rirb.cmds) {
                        *val = chip->res;
                        if (extval)
@@ -175,9 +181,13 @@ static int rirb_get_response(struct lola *chip, unsigned int *val,
                        break;
                udelay(20);
                cond_resched();
-               lola_update_rirb(chip);
        }
        printk(KERN_WARNING SFX "RIRB response error\n");
+       if (!chip->polling_mode) {
+               printk(KERN_WARNING SFX "switching to polling mode\n");
+               chip->polling_mode = 1;
+               goto again;
+       }
        return -EIO;
 }
 

diff --git a/sound/pci/lola/lola.h b/sound/pci/lola/lola.h
index 400ab5ef4c6cede24a26d1ceecf610e44bb3c394..d5708e29b16df9b11831214d3be84b348e10ba3c 100644 (file)
--- a/sound/pci/lola/lola.h
+++ b/sound/pci/lola/lola.h
@@ -374,8 +374,9 @@ struct lola {
        unsigned int sample_rate_max;
 
        /* flags */
-       unsigned int initialized :1;
-       unsigned int cold_reset :1;
+       unsigned int initialized:1;
+       unsigned int cold_reset:1;
+       unsigned int polling_mode:1;
 
        /* for debugging */
        unsigned int debug_res;