diff options
| author | Ander Conselvan de Oliveira | 2017-03-02 13:58:57 +0100 |
|---|---|---|
| committer | Ander Conselvan de Oliveira | 2017-03-03 11:32:37 +0100 |
| commit | e081c8463ac947e75f20ee11c6516f089efddaf6 (patch) | |
| tree | 15ff57fba2082c63e494daf40d17530038258990 /drivers/gpu/drm/i915/intel_ddi.c | |
| parent | drm/i915: Remove direct usages of intel_crtc->config from DDI code (diff) | |
| download | kernel-qcow2-linux-e081c8463ac947e75f20ee11c6516f089efddaf6.tar.gz kernel-qcow2-linux-e081c8463ac947e75f20ee11c6516f089efddaf6.tar.xz kernel-qcow2-linux-e081c8463ac947e75f20ee11c6516f089efddaf6.zip | |
drm/i915: Remove duplicate DDI enabling logic from MST path
The logic to enable a DDI in intel_mst_pre_enable_dp() is essentially
the same as in intel_ddi_pre_enable_dp(). So reuse the latter function
by calling the post_disable hook on the intel_dig_port instead of
duplicating that code.
v2: Don't oops because of a NULL encoder->crtc. (Ville)
v3: Warn for MST + PORT_E too. (Ville)
Cc: Imre Deak <imre.deak@intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170302125857.14665-8-ander.conselvan.de.oliveira@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/intel_ddi.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_ddi.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c index ebccd4863d7f..04676760e6fd 100644 --- a/drivers/gpu/drm/i915/intel_ddi.c +++ b/drivers/gpu/drm/i915/intel_ddi.c @@ -1713,6 +1713,8 @@ static void intel_ddi_pre_enable_dp(struct intel_encoder *encoder, enum port port = intel_ddi_get_encoder_port(encoder); struct intel_digital_port *dig_port = enc_to_dig_port(&encoder->base); + WARN_ON(link_mst && (port == PORT_A || port == PORT_E)); + intel_dp_set_link_params(intel_dp, link_rate, lane_count, link_mst); if (encoder->type == INTEL_OUTPUT_EDP) |