On Fri, 13 Nov 2015 06:56:17 +0100, Takashi Iwai wrote:
On Fri, 13 Nov 2015 02:55:25 +0100, Libin Yang wrote:
On 11/13/2015 12:20 AM, Takashi Iwai wrote:
Since we have a new audio component ops to fetch the current ELD and state now, we can reduce the usage of unsol event of HDMI/DP pins. The unsol event isn't only unreliable, but it also needs the power up/down of the codec and link at each time, which is a significant power and time loss.
In this patch, the jack creation and unsol/jack event handling are modified to use the audio component for the dedicated Intel chips.
The jack handling got slightly more codes than a simple usage of hda_jack layer since we need to deal directly with snd_jack object; the hda_jack layer is basically designed for the pin sense read and unsol events, both of which aren't used any longer in our case.
Signed-off-by: Takashi Iwai tiwai@suse.de
sound/pci/hda/patch_hdmi.c | 83 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 81 insertions(+), 2 deletions(-)
diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index 60cd9e700909..ca1d2d4a295e 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -83,6 +83,7 @@ struct hdmi_spec_per_pin { struct mutex lock; struct delayed_work work; struct snd_kcontrol *eld_ctl;
- struct snd_jack *acomp_jack; /* jack via audio component */ int repoll_count; bool setup; /* the stream has been set up by prepare callback */ int channels; /* current number of channels */
@@ -141,6 +142,7 @@ struct hdmi_spec { struct hdmi_ops ops;
bool dyn_pin_out;
bool use_acomp; /* use audio component for ELD notify/update */
/*
- Non-generic VIA/NVIDIA specific
@@ -1530,6 +1532,9 @@ static int hdmi_read_pin_conn(struct hda_codec *codec, int pin_idx) return 0; }
+static void sync_eld_via_acomp(struct hda_codec *codec,
struct hdmi_spec_per_pin *per_pin);- static bool hdmi_present_sense(struct hdmi_spec_per_pin *per_pin, int repoll) { struct hda_jack_tbl *jack;
@@ -1551,6 +1556,11 @@ static bool hdmi_present_sense(struct hdmi_spec_per_pin *per_pin, int repoll) bool eld_changed = false; bool ret;
- if (spec->use_acomp) {
sync_eld_via_acomp(codec, per_pin);return false; /* don't call snd_hda_jack_report_sync() */I think we still need call intel_verify_pin_cvt_connect(), intel_not_share_assigned_cvt() and hdmi_setup_audio_infoframe() as before if eld_valid is true.
Right, also ELD kctl notification is missing, too. It implies that we'd better refactor the ELD update code, split the code from hdmi_present_sense() to do both commonly.
FYI, I updated the patchset on test/hdmi-jack branch now. It receives audio_enabled state, and handles ELD update more properly.
Takashi