redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

drm/i915: Remove most encoder->type uses from the audio code 

encoder->type isn't genreally safe around DDI ports, so let's
replace some uses in the audio code with the crtc state's
output_types instead.

Actually in these cases encoder->type would work since the DP
SST case is only relevant for VLV/CHV and encoder->type==DP
is a thing on those platforms. The DP MST cases would work
as well since MST encoder->type==DP_MST always. But I think
it's best to try and minimize the encoder->type use in general
to avoid showing a bad example to people.

Cc: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171030184654.17429-2-ville.syrjala@linux.intel.com
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
hifive-unleashed-5.1
Ville Syrjälä 2017-10-30 20:46:54 +02:00
parent 8ec47de21b
commit 9f846643c7
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/gpu/drm/i915/intel_audio.c
View File

@ -641,7 +641,7 @@ void intel_audio_codec_enable(struct intel_encoder *encoder,
if (acomp && acomp->audio_ops && acomp->audio_ops->pin_eld_notify) {
/* audio drivers expect pipe = -1 to indicate Non-MST cases */
if (encoder->type != INTEL_OUTPUT_DP_MST)
if (!intel_crtc_has_type(crtc_state, INTEL_OUTPUT_DP_MST))
pipe = -1;
acomp->audio_ops->pin_eld_notify(acomp->audio_ops->audio_ptr,
(int) port, (int) pipe);
@ -649,7 +649,7 @@ void intel_audio_codec_enable(struct intel_encoder *encoder,
intel_lpe_audio_notify(dev_priv, pipe, port, connector->eld,
crtc_state->port_clock,
encoder->type == INTEL_OUTPUT_DP);
intel_crtc_has_dp_encoder(crtc_state));
}
/**
@ -683,7 +683,7 @@ void intel_audio_codec_disable(struct intel_encoder *encoder,
if (acomp && acomp->audio_ops && acomp->audio_ops->pin_eld_notify) {
/* audio drivers expect pipe = -1 to indicate Non-MST cases */
if (encoder->type != INTEL_OUTPUT_DP_MST)
if (!intel_crtc_has_type(old_crtc_state, INTEL_OUTPUT_DP_MST))
pipe = -1;
acomp->audio_ops->pin_eld_notify(acomp->audio_ops->audio_ptr,
(int) port, (int) pipe);