diff options
Diffstat (limited to 'drivers/gpu/drm/i915/intel_dp_mst.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_dp_mst.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c index 653ca39789b8..c3de0918ee13 100644 --- a/drivers/gpu/drm/i915/intel_dp_mst.c +++ b/drivers/gpu/drm/i915/intel_dp_mst.c | |||
@@ -209,7 +209,7 @@ static void intel_mst_pre_enable_dp(struct intel_encoder *encoder, | |||
209 | struct intel_digital_port *intel_dig_port = intel_mst->primary; | 209 | struct intel_digital_port *intel_dig_port = intel_mst->primary; |
210 | struct intel_dp *intel_dp = &intel_dig_port->dp; | 210 | struct intel_dp *intel_dp = &intel_dig_port->dp; |
211 | struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); | 211 | struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); |
212 | enum port port = intel_dig_port->port; | 212 | enum port port = intel_dig_port->base.port; |
213 | struct intel_connector *connector = | 213 | struct intel_connector *connector = |
214 | to_intel_connector(conn_state->connector); | 214 | to_intel_connector(conn_state->connector); |
215 | int ret; | 215 | int ret; |
@@ -253,7 +253,7 @@ static void intel_mst_enable_dp(struct intel_encoder *encoder, | |||
253 | struct intel_digital_port *intel_dig_port = intel_mst->primary; | 253 | struct intel_digital_port *intel_dig_port = intel_mst->primary; |
254 | struct intel_dp *intel_dp = &intel_dig_port->dp; | 254 | struct intel_dp *intel_dp = &intel_dig_port->dp; |
255 | struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); | 255 | struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); |
256 | enum port port = intel_dig_port->port; | 256 | enum port port = intel_dig_port->base.port; |
257 | int ret; | 257 | int ret; |
258 | 258 | ||
259 | DRM_DEBUG_KMS("active links %d\n", intel_dp->active_mst_links); | 259 | DRM_DEBUG_KMS("active links %d\n", intel_dp->active_mst_links); |
@@ -552,7 +552,7 @@ intel_dp_create_fake_mst_encoder(struct intel_digital_port *intel_dig_port, enum | |||
552 | 552 | ||
553 | intel_encoder->type = INTEL_OUTPUT_DP_MST; | 553 | intel_encoder->type = INTEL_OUTPUT_DP_MST; |
554 | intel_encoder->power_domain = intel_dig_port->base.power_domain; | 554 | intel_encoder->power_domain = intel_dig_port->base.power_domain; |
555 | intel_encoder->port = intel_dig_port->port; | 555 | intel_encoder->port = intel_dig_port->base.port; |
556 | intel_encoder->crtc_mask = 0x7; | 556 | intel_encoder->crtc_mask = 0x7; |
557 | intel_encoder->cloneable = 0; | 557 | intel_encoder->cloneable = 0; |
558 | 558 | ||