diff options
| author | Ville Syrjälä <[email protected]> | 2017-10-30 18:46:53 +0000 |
|---|---|---|
| committer | Ville Syrjälä <[email protected]> | 2017-10-31 19:50:43 +0000 |
| commit | 8ec47de21bfab96790c4202ae8cdb5092ad7ec33 (patch) | |
| tree | 692b7ac6c6d98ff384932fbdf97b2bbb1006ba82 /drivers/gpu/drm/i915/intel_dp_mst.c | |
| parent | drm/i915: Replace "cc-option -Wno-foo" with "cc-disable-warning foo" (diff) | |
| download | kernel-8ec47de21bfab96790c4202ae8cdb5092ad7ec33.tar.gz kernel-8ec47de21bfab96790c4202ae8cdb5092ad7ec33.zip | |
drm/i915: Pass around crtc and connector states for audio
Explicitly pass the crtc and connector states into the audio
code enable/disable hooks, and plumb them all the way down.
This gets rid of almost all crtc->config and encoder->crtc
uses. The one place where we still use them is
i915_audio_component_sync_audio_rate() since that gets called from
the audio driver and we don't have explicit states around then.
Cc: Jani Nikula <[email protected]>
Signed-off-by: Ville Syrjälä <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
Reviewed-by: Jani Nikula <[email protected]>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_dp_mst.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_dp_mst.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c index 6f11bb35f66f..653ca39789b8 100644 --- a/drivers/gpu/drm/i915/intel_dp_mst.c +++ b/drivers/gpu/drm/i915/intel_dp_mst.c @@ -149,7 +149,8 @@ static void intel_mst_disable_dp(struct intel_encoder *encoder, DRM_ERROR("failed to update payload %d\n", ret); } if (old_crtc_state->has_audio) - intel_audio_codec_disable(encoder); + intel_audio_codec_disable(encoder, + old_crtc_state, old_conn_state); } static void intel_mst_post_disable_dp(struct intel_encoder *encoder, |