OpenSDV
/
original_kernel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ALSA: x86: Implement jack control 

This patch implements a jack interface for notifying HDMI/DP
connection.  PA listens to this, so it can handle the monitor
connection more gracefully.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2017-02-14 12:29:38 +01:00
parent 9f1bc2c4c5
commit b9bacf275c
2 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sound/x86/intel_hdmi_audio.c
View File

@ -37,6 +37,7 @@
#include <sound/pcm_params.h>
#include <sound/initval.h>
#include <sound/control.h>
#include <sound/jack.h>
#include <drm/drm_edid.h>
#include <drm/intel_lpe_audio.h>
#include "intel_hdmi_audio.h"
@ -1382,6 +1383,8 @@ static void had_process_hot_plug(struct snd_intelhad *intelhaddata)
}
had_build_channel_allocation_map(intelhaddata);
snd_jack_report(intelhaddata->jack, SND_JACK_AVOUT);
}
/* process hot unplug, called from wq with mutex locked */
@ -1414,6 +1417,7 @@ static void had_process_hot_unplug(struct snd_intelhad *intelhaddata)
snd_pcm_stop(substream, SNDRV_PCM_STATE_SETUP);
out:
snd_jack_report(intelhaddata->jack, 0);
if (substream)
had_substream_put(intelhaddata);
kfree(intelhaddata->chmap->chmap);
@ -1608,6 +1612,21 @@ static void had_audio_wq(struct work_struct *work)
pm_runtime_put(ctx->dev);
}
/*
* Jack interface
*/
static int had_create_jack(struct snd_intelhad *ctx)
{
int err;
err = snd_jack_new(ctx->card, "HDMI/DP", SND_JACK_AVOUT, &ctx->jack,
true, false);
if (err < 0)
return err;
ctx->jack->private_data = ctx;
return 0;
}
/*
* PM callbacks
*/
@ -1780,6 +1799,10 @@ static int hdmi_lpe_audio_probe(struct platform_device *pdev)
if (ret < 0)
goto err;
ret = had_create_jack(ctx);
if (ret < 0)
goto err;
ret = snd_card_register(card);
if (ret)
goto err;

1
sound/x86/intel_hdmi_audio.h
View File

@ -130,6 +130,7 @@ struct snd_intelhad {
struct work_struct hdmi_audio_wq;
struct mutex mutex; /* for protecting chmap and eld */
bool need_reset;
struct snd_jack *jack;
};
#endif /* _INTEL_HDMI_AUDIO_ */