diff options
| author | Takashi Iwai | 2017-01-31 21:16:51 +0100 |
|---|---|---|
| committer | Takashi Iwai | 2017-02-01 16:22:10 +0100 |
| commit | f95e29b92190607c66dc5c96b7e0de9c332062c2 (patch) | |
| tree | 1a28e27943ced9fb030d600a35ad91282741aded /drivers/gpu/drm/i915/intel_audio.c | |
| parent | drm/i915: Avoid MST pipe handling for LPE audio (diff) | |
| download | kernel-qcow2-linux-f95e29b92190607c66dc5c96b7e0de9c332062c2.tar.gz kernel-qcow2-linux-f95e29b92190607c66dc5c96b7e0de9c332062c2.tar.xz kernel-qcow2-linux-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_audio.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_audio.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c index d4e6d1136cfe..892169b7952b 100644 --- a/drivers/gpu/drm/i915/intel_audio.c +++ b/drivers/gpu/drm/i915/intel_audio.c @@ -634,12 +634,12 @@ void intel_audio_codec_enable(struct intel_encoder *intel_encoder, switch (intel_encoder->type) { case INTEL_OUTPUT_HDMI: - intel_lpe_audio_notify(dev_priv, connector->eld, port, + intel_lpe_audio_notify(dev_priv, connector->eld, port, pipe, crtc_state->port_clock, false, 0); break; case INTEL_OUTPUT_DP: - intel_lpe_audio_notify(dev_priv, connector->eld, port, + intel_lpe_audio_notify(dev_priv, connector->eld, port, pipe, adjusted_mode->crtc_clock, true, crtc_state->port_clock); break; @@ -680,7 +680,7 @@ void intel_audio_codec_disable(struct intel_encoder *intel_encoder) (int) port, (int) pipe); } - intel_lpe_audio_notify(dev_priv, NULL, port, 0, false, 0); + intel_lpe_audio_notify(dev_priv, NULL, port, pipe, 0, false, 0); } /** |