summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_lpe_audio.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2017-01-31 14:16:51 -0600
committerTakashi Iwai <tiwai@suse.de>2017-02-01 16:22:10 +0100
commitf95e29b92190607c66dc5c96b7e0de9c332062c2 (patch)
tree1a28e27943ced9fb030d600a35ad91282741aded /drivers/gpu/drm/i915/intel_lpe_audio.c
parent9c9191f3de5926830346750ce4417d261027ab80 (diff)
downloadlinux-stable-f95e29b92190607c66dc5c96b7e0de9c332062c2.tar.gz
linux-stable-f95e29b92190607c66dc5c96b7e0de9c332062c2.tar.bz2
linux-stable-f95e29b92190607c66dc5c96b7e0de9c332062c2.zip
drm/i915: Pass pipe to LPE audio notification
The LPE audio configuration depends on the pipe, thus we need to pass the currently used pipe. It's now embedded in struct intel_hdmi_lpe_audio_eld as well as port id. Acked-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_lpe_audio.c')
-rw-r--r--drivers/gpu/drm/i915/intel_lpe_audio.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_lpe_audio.c b/drivers/gpu/drm/i915/intel_lpe_audio.c
index 5da14f40f94a..68ebf3830433 100644
--- a/drivers/gpu/drm/i915/intel_lpe_audio.c
+++ b/drivers/gpu/drm/i915/intel_lpe_audio.c
@@ -332,7 +332,7 @@ void intel_lpe_audio_teardown(struct drm_i915_private *dev_priv)
* Notify lpe audio driver of eld change.
*/
void intel_lpe_audio_notify(struct drm_i915_private *dev_priv,
- void *eld, int port, int tmds_clk_speed,
+ void *eld, int port, int pipe, int tmds_clk_speed,
bool dp_output, int link_rate)
{
unsigned long irq_flags;
@@ -353,6 +353,7 @@ void intel_lpe_audio_notify(struct drm_i915_private *dev_priv,
memcpy(pdata->eld.eld_data, eld,
HDMI_MAX_ELD_BYTES);
pdata->eld.port_id = port;
+ pdata->eld.pipe_id = pipe;
pdata->hdmi_connected = true;
pdata->dp_output = dp_output;