summaryrefslogtreecommitdiffstats
path: root/sound/x86
diff options
context:
space:
mode:
authorVille Syrjälä <ville.syrjala@linux.intel.com>2017-04-27 19:02:24 +0300
committerVille Syrjälä <ville.syrjala@linux.intel.com>2017-05-03 16:20:26 +0300
commitc98ec5ba6cbbaaa98cb4c00888aecf58f7d470c5 (patch)
treed65f778b261e38a7f40c8005ab79975bcc9a1606 /sound/x86
parentd2205595800dbd53eba06318e399a1cba1c0fc67 (diff)
downloadlinux-stable-c98ec5ba6cbbaaa98cb4c00888aecf58f7d470c5.tar.gz
linux-stable-c98ec5ba6cbbaaa98cb4c00888aecf58f7d470c5.tar.bz2
linux-stable-c98ec5ba6cbbaaa98cb4c00888aecf58f7d470c5.zip
drm/i915: Replace tmds_clock_speed and link_rate with just ls_clock
There's no need to distinguish between the DP link rate and HDMI TMDS clock for the purposes of the LPE audio. Both are actually the same thing more or less, which is the link symbol clock. So let's just call the thing ls_clock and simplify the code. Cc: Takashi Iwai <tiwai@suse.de> Cc: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/20170427160231.13337-6-ville.syrjala@linux.intel.com Reviewed-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/x86')
-rw-r--r--sound/x86/intel_hdmi_audio.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/sound/x86/intel_hdmi_audio.c b/sound/x86/intel_hdmi_audio.c
index cbba4a78afb5..4eaf5de54f61 100644
--- a/sound/x86/intel_hdmi_audio.c
+++ b/sound/x86/intel_hdmi_audio.c
@@ -1568,7 +1568,7 @@ static void had_audio_wq(struct work_struct *work)
struct intel_hdmi_lpe_audio_eld *eld = &pdata->eld;
dev_dbg(ctx->dev, "%s: HAD_NOTIFY_ELD : port = %d, tmds = %d\n",
- __func__, eld->port_id, pdata->tmds_clock_speed);
+ __func__, eld->port_id, pdata->ls_clock);
switch (eld->pipe_id) {
case 0:
@@ -1589,8 +1589,13 @@ static void had_audio_wq(struct work_struct *work)
memcpy(ctx->eld, eld->eld_data, sizeof(ctx->eld));
ctx->dp_output = pdata->dp_output;
- ctx->tmds_clock_speed = pdata->tmds_clock_speed;
- ctx->link_rate = pdata->link_rate;
+ if (ctx->dp_output) {
+ ctx->tmds_clock_speed = 0;
+ ctx->link_rate = pdata->ls_clock;
+ } else {
+ ctx->tmds_clock_speed = pdata->ls_clock;
+ ctx->link_rate = 0;
+ }
had_process_hot_plug(ctx);