sound: oxygen: cache codec registers

Keep a cache of codec registers to avoid unnecessary writes.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

1 files changed, 87 insertions, 53 deletions

diff --git a/sound/pci/oxygen/xonar_cs43xx.c b/sound/pci/oxygen/xonar_cs43xx.c
index a8ec4e8271a4..330c5e755917 100644
--- a/sound/pci/oxygen/xonar_cs43xx.c
+++ b/sound/pci/oxygen/xonar_cs43xx.c
@@ -69,62 +69,58 @@
 
 struct xonar_cs43xx {
         struct xonar_generic generic;
-        u8 cs4398_fm;
-        u8 cs4362a_fm;
-        u8 cs4362a_fm_c;
+        u8 cs4398_regs[7];
+        u8 cs4362a_regs[15];
 };
 
 static void cs4398_write(struct oxygen *chip, u8 reg, u8 value)
 {
-        oxygen_write_i2c(chip, I2C_DEVICE_CS4398, reg, value);
-}
+        struct xonar_cs43xx *data = chip->model_data;
 
-static void cs4362a_write(struct oxygen *chip, u8 reg, u8 value)
-{
-        oxygen_write_i2c(chip, I2C_DEVICE_CS4362A, reg, value);
+        oxygen_write_i2c(chip, I2C_DEVICE_CS4398, reg, value);
+        if (reg < ARRAY_SIZE(data->cs4398_regs))
+                data->cs4398_regs[reg] = value;
 }
 
-static void update_cs4362a_volumes(struct oxygen *chip)
+static void cs4398_write_cached(struct oxygen *chip, u8 reg, u8 value)
 {
-        u8 mute;
+        struct xonar_cs43xx *data = chip->model_data;
 
-        mute = chip->dac_mute ? CS4362A_MUTE : 0;
-        cs4362a_write(chip, 7, (127 - chip->dac_volume[2]) | mute);
-        cs4362a_write(chip, 8, (127 - chip->dac_volume[3]) | mute);
-        cs4362a_write(chip, 10, (127 - chip->dac_volume[4]) | mute);
-        cs4362a_write(chip, 11, (127 - chip->dac_volume[5]) | mute);
-        cs4362a_write(chip, 13, (127 - chip->dac_volume[6]) | mute);
-        cs4362a_write(chip, 14, (127 - chip->dac_volume[7]) | mute);
+        if (value != data->cs4398_regs[reg])
+                cs4398_write(chip, reg, value);
 }
 
-static void update_cs43xx_volume(struct oxygen *chip)
+static void cs4362a_write(struct oxygen *chip, u8 reg, u8 value)
 {
-        cs4398_write(chip, 5, (127 - chip->dac_volume[0]) * 2);
-        cs4398_write(chip, 6, (127 - chip->dac_volume[1]) * 2);
-        update_cs4362a_volumes(chip);
+        struct xonar_cs43xx *data = chip->model_data;
+
+        oxygen_write_i2c(chip, I2C_DEVICE_CS4362A, reg, value);
+        if (reg < ARRAY_SIZE(data->cs4362a_regs))
+                data->cs4362a_regs[reg] = value;
 }
 
-static void update_cs43xx_mute(struct oxygen *chip)
+static void cs4362a_write_cached(struct oxygen *chip, u8 reg, u8 value)
 {
-        u8 reg;
+        struct xonar_cs43xx *data = chip->model_data;
 
-        reg = CS4398_MUTEP_LOW | CS4398_PAMUTE;
-        if (chip->dac_mute)
-                reg |= CS4398_MUTE_B | CS4398_MUTE_A;
-        cs4398_write(chip, 4, reg);
-        update_cs4362a_volumes(chip);
+        if (value != data->cs4362a_regs[reg])
+                cs4362a_write(chip, reg, value);
 }
 
-static void cs43xx_init(struct oxygen *chip)
+static void cs43xx_registers_init(struct oxygen *chip)
 {
         struct xonar_cs43xx *data = chip->model_data;
+        unsigned int i;
 
         /* set CPEN (control port mode) and power down */
         cs4398_write(chip, 8, CS4398_CPEN | CS4398_PDN);
         cs4362a_write(chip, 0x01, CS4362A_PDN | CS4362A_CPEN);
         /* configure */
-        cs4398_write(chip, 2, data->cs4398_fm);
+        cs4398_write(chip, 2, data->cs4398_regs[2]);
         cs4398_write(chip, 3, CS4398_ATAPI_B_R | CS4398_ATAPI_A_L);
+        cs4398_write(chip, 4, data->cs4398_regs[4]);
+        cs4398_write(chip, 5, data->cs4398_regs[5]);
+        cs4398_write(chip, 6, data->cs4398_regs[6]);
         cs4398_write(chip, 7, CS4398_RMP_DN | CS4398_RMP_UP |
                      CS4398_ZERO_CROSS | CS4398_SOFT_RAMP);
         cs4362a_write(chip, 0x02, CS4362A_DIF_LJUST);
@@ -132,11 +128,8 @@ static void cs43xx_init(struct oxygen *chip)
                       CS4362A_RMP_UP | CS4362A_ZERO_CROSS | CS4362A_SOFT_RAMP);
         cs4362a_write(chip, 0x04, CS4362A_RMP_DN | CS4362A_DEM_NONE);
         cs4362a_write(chip, 0x05, 0);
-        cs4362a_write(chip, 0x06, data->cs4362a_fm);
-        cs4362a_write(chip, 0x09, data->cs4362a_fm_c);
-        cs4362a_write(chip, 0x0c, data->cs4362a_fm);
-        update_cs43xx_volume(chip);
-        update_cs43xx_mute(chip);
+        for (i = 6; i <= 14; ++i)
+                cs4362a_write(chip, i, data->cs4362a_regs[i]);
         /* clear power down */
         cs4398_write(chip, 8, CS4398_CPEN);
         cs4362a_write(chip, 0x01, CS4362A_CPEN);
@@ -148,17 +141,29 @@ static void xonar_d1_init(struct oxygen *chip)
 
         data->generic.anti_pop_delay = 800;
         data->generic.output_enable_bit = GPIO_D1_OUTPUT_ENABLE;
-        data->cs4398_fm = CS4398_FM_SINGLE | CS4398_DEM_NONE | CS4398_DIF_LJUST;
-        data->cs4362a_fm = CS4362A_FM_SINGLE |
+        data->cs4398_regs[2] =
+                CS4398_FM_SINGLE | CS4398_DEM_NONE | CS4398_DIF_LJUST;
+        data->cs4398_regs[4] = CS4398_MUTEP_LOW |
+                CS4398_MUTE_B | CS4398_MUTE_A | CS4398_PAMUTE;
+        data->cs4398_regs[5] = 60 * 2;
+        data->cs4398_regs[6] = 60 * 2;
+        data->cs4362a_regs[6] = CS4362A_FM_SINGLE |
                 CS4362A_ATAPI_B_R | CS4362A_ATAPI_A_L;
-        data->cs4362a_fm_c = data->cs4362a_fm;
+        data->cs4362a_regs[7] = 60 | CS4362A_MUTE;
+        data->cs4362a_regs[8] = 60 | CS4362A_MUTE;
+        data->cs4362a_regs[9] = data->cs4362a_regs[6];
+        data->cs4362a_regs[10] = 60 | CS4362A_MUTE;
+        data->cs4362a_regs[11] = 60 | CS4362A_MUTE;
+        data->cs4362a_regs[12] = data->cs4362a_regs[6];
+        data->cs4362a_regs[13] = 60 | CS4362A_MUTE;
+        data->cs4362a_regs[14] = 60 | CS4362A_MUTE;
 
         oxygen_write16(chip, OXYGEN_2WIRE_BUS_STATUS,
                        OXYGEN_2WIRE_LENGTH_8 |
                        OXYGEN_2WIRE_INTERRUPT_MASK |
                        OXYGEN_2WIRE_SPEED_FAST);
 
-        cs43xx_init(chip);
+        cs43xx_registers_init(chip);
 
         oxygen_set_bits16(chip, OXYGEN_GPIO_CONTROL,
                           GPIO_D1_FRONT_PANEL | GPIO_D1_INPUT_ROUTE);
@@ -200,7 +205,7 @@ static void xonar_d1_resume(struct oxygen *chip)
 {
         oxygen_set_bits8(chip, OXYGEN_FUNCTION, OXYGEN_FUNCTION_RESET_CODEC);
         msleep(1);
-        cs43xx_init(chip);
+        cs43xx_registers_init(chip);
         xonar_enable_output(chip);
 }
 
@@ -220,27 +225,56 @@ static void set_cs43xx_params(struct oxygen *chip,
                 cs4398_fm = CS4398_FM_QUAD;
                 cs4362a_fm = CS4362A_FM_QUAD;
         }
-        data->cs4398_fm = CS4398_DEM_NONE | CS4398_DIF_LJUST | cs4398_fm;
-        data->cs4362a_fm =
-                (data->cs4362a_fm & ~CS4362A_FM_MASK) | cs4362a_fm;
-        data->cs4362a_fm_c =
-                (data->cs4362a_fm_c & ~CS4362A_FM_MASK) | cs4362a_fm;
-        cs4398_write(chip, 2, data->cs4398_fm);
-        cs4362a_write(chip, 0x06, data->cs4362a_fm);
-        cs4362a_write(chip, 0x09, data->cs4362a_fm_c);
-        cs4362a_write(chip, 0x0c, data->cs4362a_fm);
+        cs4398_fm |= CS4398_DEM_NONE | CS4398_DIF_LJUST;
+        cs4398_write_cached(chip, 2, cs4398_fm);
+        cs4362a_fm |= data->cs4362a_regs[6] & ~CS4362A_FM_MASK;
+        cs4362a_write_cached(chip, 6, cs4362a_fm);
+        cs4362a_write_cached(chip, 12, cs4362a_fm);
+        cs4362a_fm &= CS4362A_FM_MASK;
+        cs4362a_fm |= data->cs4362a_regs[9] & ~CS4362A_FM_MASK;
+        cs4362a_write_cached(chip, 9, cs4362a_fm);
+}
+
+static void update_cs4362a_volumes(struct oxygen *chip)
+{
+        unsigned int i;
+        u8 mute;
+
+        mute = chip->dac_mute ? CS4362A_MUTE : 0;
+        for (i = 0; i < 6; ++i)
+                cs4362a_write_cached(chip, 7 + i + i / 2,
+                                     (127 - chip->dac_volume[2 + i]) | mute);
+}
+
+static void update_cs43xx_volume(struct oxygen *chip)
+{
+        cs4398_write_cached(chip, 5, (127 - chip->dac_volume[0]) * 2);
+        cs4398_write_cached(chip, 6, (127 - chip->dac_volume[1]) * 2);
+        update_cs4362a_volumes(chip);
+}
+
+static void update_cs43xx_mute(struct oxygen *chip)
+{
+        u8 reg;
+
+        reg = CS4398_MUTEP_LOW | CS4398_PAMUTE;
+        if (chip->dac_mute)
+                reg |= CS4398_MUTE_B | CS4398_MUTE_A;
+        cs4398_write_cached(chip, 4, reg);
+        update_cs4362a_volumes(chip);
 }
 
 static void update_cs43xx_center_lfe_mix(struct oxygen *chip, bool mixed)
 {
         struct xonar_cs43xx *data = chip->model_data;
+        u8 reg;
 
-        data->cs4362a_fm_c &= ~CS4362A_ATAPI_MASK;
+        reg = data->cs4362a_regs[9] & ~CS4362A_ATAPI_MASK;
         if (mixed)
-                data->cs4362a_fm_c |= CS4362A_ATAPI_B_LR | CS4362A_ATAPI_A_LR;
+                reg |= CS4362A_ATAPI_B_LR | CS4362A_ATAPI_A_LR;
         else
-                data->cs4362a_fm_c |= CS4362A_ATAPI_B_R | CS4362A_ATAPI_A_L;
-        cs4362a_write(chip, 0x09, data->cs4362a_fm_c);
+                reg |= CS4362A_ATAPI_B_R | CS4362A_ATAPI_A_L;
+        cs4362a_write_cached(chip, 9, reg);
 }
 
 static const struct snd_kcontrol_new front_panel_switch = {