On Thu, 30 Aug 2018 20:07:37 +0200, Sasha Levin wrote:
From: Connor McAdams conmanx360@gmail.com
[ Upstream commit c986f50ca974397f8726bf6776ad8938d6808848 ]
The Recon3D can use many of the same functions as the Recon3Di, so many of the r3di prefix function remain the same, but change their names to the more generic r3d prefix. This patch does this, and adds quirk checks for things specific to the Recon3Di.
Signed-off-by: Connor McAdams conmanx360@gmail.com Signed-off-by: Takashi Iwai tiwai@suse.de Signed-off-by: Sasha Levin alexander.levin@microsoft.com
... and this and only patch 78 don't suffice for the support of Recon3D. We need either a complete series of backports or to drop these.
thanks,
Takashi
sound/pci/hda/patch_ca0132.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/sound/pci/hda/patch_ca0132.c b/sound/pci/hda/patch_ca0132.c index 321e95c409c1..27ecff0d5c72 100644 --- a/sound/pci/hda/patch_ca0132.c +++ b/sound/pci/hda/patch_ca0132.c @@ -6187,10 +6187,10 @@ static void ca0132_refresh_widget_caps(struct hda_codec *codec) } /*
- Recon3Di r3di_setup_defaults sub functions.
*/
- Recon3D r3d_setup_defaults sub functions.
-static void r3di_dsp_scp_startup(struct hda_codec *codec) +static void r3d_dsp_scp_startup(struct hda_codec *codec) { unsigned int tmp; @@ -6211,7 +6211,7 @@ static void r3di_dsp_scp_startup(struct hda_codec *codec) } -static void r3di_dsp_initial_mic_setup(struct hda_codec *codec) +static void r3d_dsp_initial_mic_setup(struct hda_codec *codec) { unsigned int tmp; @@ -6421,10 +6421,10 @@ static void ca0132_setup_defaults(struct hda_codec *codec) } /*
- Setup default parameters for Recon3Di DSP.
*/
- Setup default parameters for Recon3D/Recon3Di DSP.
-static void r3di_setup_defaults(struct hda_codec *codec) +static void r3d_setup_defaults(struct hda_codec *codec) { struct ca0132_spec *spec = codec->spec; unsigned int tmp; @@ -6434,9 +6434,9 @@ static void r3di_setup_defaults(struct hda_codec *codec) if (spec->dsp_state != DSP_DOWNLOADED) return;
- r3di_dsp_scp_startup(codec);
- r3d_dsp_scp_startup(codec);
- r3di_dsp_initial_mic_setup(codec);
- r3d_dsp_initial_mic_setup(codec);
/*remove DSP headroom*/ tmp = FLOAT_ZERO; @@ -6450,7 +6450,8 @@ static void r3di_setup_defaults(struct hda_codec *codec) /* Set speaker source? */ dspio_set_uint_param(codec, 0x32, 0x00, tmp);
- r3di_gpio_dsp_status_set(codec, R3DI_DSP_DOWNLOADED);
- if (spec->quirk == QUIRK_R3DI)
r3di_gpio_dsp_status_set(codec, R3DI_DSP_DOWNLOADED);/* Setup effect defaults */ num_fx = OUT_EFFECTS_COUNT + IN_EFFECTS_COUNT + 1; @@ -6462,7 +6463,6 @@ static void r3di_setup_defaults(struct hda_codec *codec) ca0132_effects[idx].def_vals[i]); } }
} /* @@ -7241,7 +7241,8 @@ static int ca0132_init(struct hda_codec *codec) switch (spec->quirk) { case QUIRK_R3DI:
r3di_setup_defaults(codec);
- case QUIRK_R3D:
r3d_setup_defaults(codec);-- 2.17.1